From: Jaime Marquínez Ferrándiz Date: Sun, 15 Sep 2013 10:16:37 +0000 (+0200) Subject: Merge pull request #1422 from rzhxeo/xhamster X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=cdbccafed9e5852a8d6ceb9b09058520078d37f5;p=youtube-dl Merge pull request #1422 from rzhxeo/xhamster XHamsterIE: Add support for new URL format (download in hd by default) --- cdbccafed9e5852a8d6ceb9b09058520078d37f5 diff --cc youtube_dl/extractor/xhamster.py index 88b8b6be0,e50069586..fa759d30c --- a/youtube_dl/extractor/xhamster.py +++ b/youtube_dl/extractor/xhamster.py @@@ -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[^\']*)\',\s*\'file\': \'(?P[^\']+)\',', webpage)