From: Jaime Marquínez Ferrándiz Date: Fri, 23 Aug 2013 15:23:34 +0000 (+0200) Subject: [xhamster] use determine_ext X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=fc483bb6af4bce923c65a67618019a72071f30ff;p=youtube-dl [xhamster] use determine_ext --- 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,