]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[YoutubeDL] check for --list-thumbnails immediately after processing them
authorremitamine <remitamine@gmail.com>
Thu, 10 Mar 2016 19:17:35 +0000 (20:17 +0100)
committerremitamine <remitamine@gmail.com>
Sun, 13 Mar 2016 11:41:15 +0000 (12:41 +0100)
youtube_dl/YoutubeDL.py

index b3391088f9003c3a94daa2acd4e130c6f5223cd2..8c651cd52375e1dcf986307b57f447fce4025543 100755 (executable)
@@ -1234,6 +1234,10 @@ class YoutubeDL(object):
                 if t.get('id') is None:
                     t['id'] = '%d' % i
 
+        if self.params.get('list_thumbnails'):
+            self.list_thumbnails(info_dict)
+            return
+
         if thumbnails and 'thumbnail' not in info_dict:
             info_dict['thumbnail'] = thumbnails[-1]['url']
 
@@ -1335,9 +1339,6 @@ class YoutubeDL(object):
         if self.params.get('listformats'):
             self.list_formats(info_dict)
             return
-        if self.params.get('list_thumbnails'):
-            self.list_thumbnails(info_dict)
-            return
 
         req_format = self.params.get('format')
         if req_format is None:
@@ -1901,13 +1902,8 @@ class YoutubeDL(object):
     def list_thumbnails(self, info_dict):
         thumbnails = info_dict.get('thumbnails')
         if not thumbnails:
-            tn_url = info_dict.get('thumbnail')
-            if tn_url:
-                thumbnails = [{'id': '0', 'url': tn_url}]
-            else:
-                self.to_screen(
-                    '[info] No thumbnails present for %s' % info_dict['id'])
-                return
+            self.to_screen('[info] No thumbnails present for %s' % info_dict['id'])
+            return
 
         self.to_screen(
             '[info] Thumbnails for %s:' % info_dict['id'])