]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge pull request #1422 from rzhxeo/xhamster
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 15 Sep 2013 10:16:37 +0000 (12:16 +0200)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 15 Sep 2013 10:18:39 +0000 (12:18 +0200)
XHamsterIE: Add support for new URL format (download in hd by default)

1  2 
youtube_dl/extractor/xhamster.py

index 88b8b6be09f7a8f892db8266b3e68df14e22bfe7,e5006958682e9a40e19b6ebe9c39929ecfdb703e..fa759d30cafa8ecf887391e3d0ac3a189cfe62d0
@@@ -27,7 -27,7 +27,7 @@@ class XHamsterIE(InfoExtractor)
          mobj = re.match(self._VALID_URL, url)
  
          video_id = mobj.group('id')
-         mrss_url = 'http://xhamster.com/movies/%s/.html' % video_id
 -        mrss_url = 'http://' +  mobj.group('url')
++        mrss_url = 'http://xhamster.com/movies/%s/.html?hd' % video_id
          webpage = self._download_webpage(mrss_url, video_id)
  
          mobj = re.search(r'\'srv\': \'(?P<server>[^\']*)\',\s*\'file\': \'(?P<file>[^\']+)\',', webpage)