youtube-dl

commit dcd60025f89d3e87c0766b1163f7577c5e673342
parent 26396311b557696491152fd002f6d55e8126228b
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Tue, 27 Nov 2012 18:27:46 +0100

Fix filename sanitation (Closes #555)

Diffstat:
M
youtube_dl/FileDownloader.py
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
@@ -327,8 +327,10 @@ class FileDownloader(object):
 		"""Generate the output filename."""
 		try:
 			template_dict = dict(info_dict)
-			template_dict['epoch'] = unicode(int(time.time()))
-			template_dict['autonumber'] = unicode('%05d' % self._num_downloads)
+			template_dict['epoch'] = int(time.time())
+			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
 			return filename
 		except (ValueError, KeyError), err:
@@ -368,7 +370,6 @@ class FileDownloader(object):
 				raise MaxDownloadsReached()
 
 		filename = self.prepare_filename(info_dict)
-		filename = sanitize_filename(filename, self.params.get('restrictfilenames'))
 
 		# Forced printings
 		if self.params.get('forcetitle', False):