From: Yen Chi Hsuan Date: Tue, 19 Jan 2016 20:00:37 +0000 (+0800) Subject: [letv] LetvCloud: Detect ext instead of the hardcoded one X-Git-Tag: 2016.01.23~34^2~3 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=bec30224ff86d11c3f61808dbe683f97940ba23e;p=youtube-dl.git [letv] LetvCloud: Detect ext instead of the hardcoded one --- diff --git a/youtube_dl/extractor/letv.py b/youtube_dl/extractor/letv.py index b15ac163ed..08bdae8a21 100644 --- a/youtube_dl/extractor/letv.py +++ b/youtube_dl/extractor/letv.py @@ -19,6 +19,7 @@ from ..utils import ( int_or_none, str_or_none, encode_data_uri, + url_basename, ) @@ -295,12 +296,17 @@ class LetvCloudIE(InfoExtractor): else: raise ExtractorError('Letv cloud returned an unknwon error') + def b64decode(s): + return base64.b64decode(s.encode('utf-8')).decode('utf-8') + formats = [] for media in play_json['data']['video_info']['media'].values(): play_url = media['play_url'] + url = b64decode(play_url['main_url']) + decoded_url = b64decode(url_basename(url)) formats.append({ - 'url': base64.b64decode(play_url['main_url'].encode('utf-8')).decode('utf-8'), - 'ext': 'mp4', + 'url': url, + 'ext': determine_ext(decoded_url), 'format_id': int_or_none(play_url.get('vtype')), 'format_note': str_or_none(play_url.get('definition')), 'width': int_or_none(play_url.get('vwidth')),