youtube-dl

commit be6d722904f646e1c7f879cd32bfced22abffada
parent d5519808235997db2189e840bf87c89693a208cc
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Sat,  7 Jun 2014 15:39:21 +0200

[cnn] Improve thumbnail extraction

Diffstat:
M
youtube_dl/YoutubeDL.py
 | 
2
++
M
youtube_dl/extractor/cnn.py
 | 
10
++++++----

2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
@@ -719,6 +719,8 @@ class YoutubeDL(object):
 
         thumbnails = info_dict.get('thumbnails')
         if thumbnails:
+            thumbnails.sort(key=lambda t: (
+                t.get('width'), t.get('height'), t.get('url')))
             for t in thumbnails:
                 if 'width' in t and 'height' in t:
                     t['resolution'] = '%dx%d' % (t['width'], t['height'])
diff --git a/youtube_dl/extractor/cnn.py b/youtube_dl/extractor/cnn.py
@@ -79,8 +79,11 @@ class CNNIE(InfoExtractor):
 
         self._sort_formats(formats)
 
-        thumbnails = sorted([((int(t.attrib['height']),int(t.attrib['width'])), t.text) for t in info.findall('images/image')])
-        thumbs_dict = [{'resolution': res, 'url': t_url} for (res, t_url) in thumbnails]
+        thumbnails = [{
+            'height': int(t.attrib['height']),
+            'width': int(t.attrib['width']),
+            'url': t.text,
+        } for t in info.findall('images/image')]
 
         metas_el = info.find('metas')
         upload_date = (
@@ -93,8 +96,7 @@ class CNNIE(InfoExtractor):
             'id': info.attrib['id'],
             'title': info.find('headline').text,
             'formats': formats,
-            'thumbnail': thumbnails[-1][1],
-            'thumbnails': thumbs_dict,
+            'thumbnails': thumbnails,
             'description': info.find('description').text,
             'duration': duration,
             'upload_date': upload_date,