Upstream/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-15 21:57:53 +01:00
Code Issues Projects Releases Wiki Activity

replaced inefficient code

Browse Source
This commit is contained in:
Lucas 2015-09-28 22:00:56 +02:00 committed by Jaime Marquínez Ferrándiz
parent 47f2d01a5a
commit 892015b088
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
youtube_dl/extractor/kika.py
View File

@ -87,29 +87,25 @@ class KikaIE(InfoExtractor):
format_dict['url'] = elem.find('progressiveDownloadUrl').text format_dict['url'] = elem.find('progressiveDownloadUrl').text
format_dict['ext'] = elem.find('mediaType').text.lower() format_dict['ext'] = elem.find('mediaType').text.lower()
format_dict['format'] = elem.find('profileName').text format_dict['format'] = elem.find('profileName').text
width = int(elem.find('frameWidth').text) format_dict['width'] = int(elem.find('frameWidth').text)
height = int(elem.find('frameHeight').text) format_dict['height'] = int(elem.find('frameHeight').text)
format_dict['width'] = width format_dict['resolution'] = '%dx%d' % (format_dict['width'],
format_dict['height'] = height format_dict['height'])
format_dict['resolution'] = '%dx%d' % (width, height)
format_dict['abr'] = int(elem.find('bitrateAudio').text) format_dict['abr'] = int(elem.find('bitrateAudio').text)
format_dict['vbr'] = int(elem.find('bitrateVideo').text) format_dict['vbr'] = int(elem.find('bitrateVideo').text)
format_dict['tbr'] = format_dict['abr'] + format_dict['vbr'] format_dict['tbr'] = format_dict['abr'] + format_dict['vbr']
format_dict['filesize'] = int(elem.find('fileSize').text) format_dict['filesize'] = int(elem.find('fileSize').text)
# append resolution and dict for sorting by resolution formats_list.append(format_dict)
formats_list.append((width * height, format_dict))
# Sort by resolution (=quality) # Sort by resolution (=quality)
formats_list.sort() formats_list.sort(key=lambda x: x['width'] * x['height'])
out_list = [x[1] for x in formats_list]
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': title,
'description': description, 'description': description,
'formats': out_list, 'formats': formats_list,
'duration': duration, 'duration': duration,
'webpage_url': webpage_url 'webpage_url': webpage_url
} }