MarcoBuster/youtube-dl
1
1
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-23 20:16:54 +01:00
Code Issues Releases Wiki Activity

Use determine_ext when saving the thumbnail

Browse Source 
Urls that contain a query produced filenames with wrong extensions
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-07-12 21:52:59 +02:00
parent 6543f0dca5
commit cbdbb76665
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/YoutubeDL.py
View File

@ -530,9 +530,7 @@ class YoutubeDL(object):
if self.params.get('writethumbnail', False): if self.params.get('writethumbnail', False):
if 'thumbnail' in info_dict: if 'thumbnail' in info_dict:
thumb_format = info_dict['thumbnail'].rpartition(u'/')[2].rpartition(u'.')[2] thumb_format = determine_ext(info_dict['thumbnail'], u'jpg')
if not thumb_format:
thumb_format = 'jpg'
thumb_filename = filename.rpartition('.')[0] + u'.' + thumb_format thumb_filename = filename.rpartition('.')[0] + u'.' + thumb_format
self.to_screen(u'[%s] %s: Downloading thumbnail ...' % self.to_screen(u'[%s] %s: Downloading thumbnail ...' %
(info_dict['extractor'], info_dict['id'])) (info_dict['extractor'], info_dict['id']))

4
youtube_dl/utils.py
View File

@ -650,12 +650,12 @@ def unified_strdate(date_str):
pass pass
return upload_date return upload_date
def determine_ext(url): def determine_ext(url, default_ext=u'unknown_video'):
guess = url.partition(u'?')[0].rpartition(u'.')[2] guess = url.partition(u'?')[0].rpartition(u'.')[2]
if re.match(r'^[A-Za-z0-9]+$', guess): if re.match(r'^[A-Za-z0-9]+$', guess):
return guess return guess
else: else:
return u'unknown_video' return default_ext
def date_from_str(date_str): def date_from_str(date_str):
""" """