]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
replaced inefficient code
authorLucas <mikotosc@gmail.com>
Mon, 28 Sep 2015 20:00:56 +0000 (22:00 +0200)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sat, 31 Oct 2015 14:18:23 +0000 (15:18 +0100)
youtube_dl/extractor/kika.py

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