X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fxhamster.py;h=88b8b6be09f7a8f892db8266b3e68df14e22bfe7;hb=8851a574a3d9a1716009c772d45d5ad4134f69bf;hp=0fd0775834fe607cfe08259bda3d78b74c73fe3a;hpb=53b0f3e4e290016ccc0a905ec8a18efb5bd9af8a;p=youtube-dl diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py index 0fd077583..88b8b6be0 100644 --- a/youtube_dl/extractor/xhamster.py +++ b/youtube_dl/extractor/xhamster.py @@ -4,6 +4,7 @@ from .common import InfoExtractor from ..utils import ( compat_urllib_parse, unescapeHTML, + determine_ext, ExtractorError, ) @@ -36,7 +37,6 @@ class XHamsterIE(InfoExtractor): video_url = compat_urllib_parse.unquote(mobj.group('file')) else: video_url = mobj.group('server')+'/key='+mobj.group('file') - video_extension = video_url.split('.')[-1].split('?')[0] video_title = self._html_search_regex(r'(?P<title>.+?) - xHamster\.com', webpage, u'title') @@ -64,7 +64,7 @@ class XHamsterIE(InfoExtractor): return [{ 'id': video_id, 'url': video_url, - 'ext': video_extension, + 'ext': determine_ext(video_url), 'title': video_title, 'description': video_description, 'upload_date': video_upload_date,