dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix filename sanitation (Closes #555)

This commit is contained in:
Philipp Hagemeister 2012-11-27 18:27:46 +01:00
parent 26396311b5
commit dcd60025f8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
youtube_dl/FileDownloader.py
View File

@ -327,8 +327,10 @@ class FileDownloader(object):
"""Generate the output filename.""" """Generate the output filename."""
try: try:
template_dict = dict(info_dict) template_dict = dict(info_dict)
template_dict['epoch'] = unicode(int(time.time())) template_dict['epoch'] = int(time.time())
template_dict['autonumber'] = unicode('%05d' % self._num_downloads) template_dict['autonumber'] = u'%05d' % self._num_downloads
template_dict = dict((k, sanitize_filename(compat_str(v), self.params.get('restrictfilenames'))) for k,v in template_dict.items())
filename = self.params['outtmpl'] % template_dict filename = self.params['outtmpl'] % template_dict
return filename return filename
except (ValueError, KeyError), err: except (ValueError, KeyError), err:
@ -368,7 +370,6 @@ class FileDownloader(object):
raise MaxDownloadsReached() raise MaxDownloadsReached()
filename = self.prepare_filename(info_dict) filename = self.prepare_filename(info_dict)
filename = sanitize_filename(filename, self.params.get('restrictfilenames'))
# Forced printings # Forced printings
if self.params.get('forcetitle', False): if self.params.get('forcetitle', False):