From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 17:27:46 +0000 (+0100)
Subject: Fix filename sanitation (Closes #555)
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=dcd60025f89d3e87c0766b1163f7577c5e673342;p=youtube-dl

Fix filename sanitation (Closes #555)
---

diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index bd0f75773..d7d5b1521 100644
--- 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):