paradizelost/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[letv] LetvCloud: Detect ext instead of the hardcoded one

Browse Source
This commit is contained in:
Yen Chi Hsuan 2016-01-20 04:00:37 +08:00
parent 0428106da3
commit bec30224ff
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/extractor/letv.py
View File

@ -19,6 +19,7 @@ from ..utils import (
int_or_none, int_or_none,
str_or_none, str_or_none,
encode_data_uri, encode_data_uri,
url_basename,
) )
@ -295,12 +296,17 @@ class LetvCloudIE(InfoExtractor):
else: else:
raise ExtractorError('Letv cloud returned an unknwon error') raise ExtractorError('Letv cloud returned an unknwon error')
def b64decode(s):
return base64.b64decode(s.encode('utf-8')).decode('utf-8')
formats = [] formats = []
for media in play_json['data']['video_info']['media'].values(): for media in play_json['data']['video_info']['media'].values():
play_url = media['play_url'] play_url = media['play_url']
url = b64decode(play_url['main_url'])
decoded_url = b64decode(url_basename(url))
formats.append({ formats.append({
'url': base64.b64decode(play_url['main_url'].encode('utf-8')).decode('utf-8'), 'url': url,
'ext': 'mp4', 'ext': determine_ext(decoded_url),
'format_id': int_or_none(play_url.get('vtype')), 'format_id': int_or_none(play_url.get('vtype')),
'format_note': str_or_none(play_url.get('definition')), 'format_note': str_or_none(play_url.get('definition')),
'width': int_or_none(play_url.get('vwidth')), 'width': int_or_none(play_url.get('vwidth')),