Merge pull request #1919 from rzhxeo/xhamster

[XHamsterIE] Fix HD video detection
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-12-07 14:35:17 -08:00
commit 42d3bf844a

View file

@ -26,7 +26,7 @@ class XHamsterIE(InfoExtractor):
{ {
u'url': u'http://xhamster.com/movies/2221348/britney_spears_sexy_booty.html?hd', u'url': u'http://xhamster.com/movies/2221348/britney_spears_sexy_booty.html?hd',
u'file': u'2221348.flv', u'file': u'2221348.flv',
u'md5': u'970a94178ca4118c5aa3aaea21211b81', u'md5': u'e767b9475de189320f691f49c679c4c7',
u'info_dict': { u'info_dict': {
u"upload_date": u"20130914", u"upload_date": u"20130914",
u"uploader_id": u"jojo747400", u"uploader_id": u"jojo747400",
@ -46,7 +46,7 @@ class XHamsterIE(InfoExtractor):
return mobj.group('server')+'/key='+mobj.group('file') return mobj.group('server')+'/key='+mobj.group('file')
def is_hd(webpage): def is_hd(webpage):
return webpage.find('<div class=\'icon iconHD\'>') != -1 return webpage.find('<div class=\'icon iconHD\'') != -1
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)