youtube-dl

commit cbdbb7666540ba07ab7e4a3a7bc34759bf0ca6d9
parent 6543f0dca5e04530450fac5a64efa5d9ee294b1b
Author: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date:   Fri, 12 Jul 2013 21:52:59 +0200

Use determine_ext when saving the thumbnail

Urls that contain a query produced filenames with wrong extensions

Diffstat:
M
youtube_dl/YoutubeDL.py
 | 
4
+---
M
youtube_dl/utils.py
 | 
4
++--

2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
@@ -530,9 +530,7 @@ class YoutubeDL(object):
 
         if self.params.get('writethumbnail', False):
             if 'thumbnail' in info_dict:
-                thumb_format = info_dict['thumbnail'].rpartition(u'/')[2].rpartition(u'.')[2]
-                if not thumb_format:
-                    thumb_format = 'jpg'
+                thumb_format = determine_ext(info_dict['thumbnail'], u'jpg')
                 thumb_filename = filename.rpartition('.')[0] + u'.' + thumb_format
                 self.to_screen(u'[%s] %s: Downloading thumbnail ...' %
                                (info_dict['extractor'], info_dict['id']))
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
@@ -650,12 +650,12 @@ def unified_strdate(date_str):
             pass
     return upload_date
 
-def determine_ext(url):
+def determine_ext(url, default_ext=u'unknown_video'):
     guess = url.partition(u'?')[0].rpartition(u'.')[2]
     if re.match(r'^[A-Za-z0-9]+$', guess):
         return guess
     else:
-        return u'unknown_video'
+        return default_ext
 
 def date_from_str(date_str):
     """