Revert "[YoutubeDL] Sanitize outtmpl as it may contain forbidden characters"
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 7 Mar 2015 21:18:16 +0000 (22:18 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 7 Mar 2015 21:18:22 +0000 (22:18 +0100)
This reverts commit 7dcad95d4faa91adfaa4d87d411c4bc55ab000e4.

The output template is most definitly allowed to contain forbidden characters; otherwise -o /foo/bar/vid.mp4 wouldn't work.

youtube_dl/YoutubeDL.py

index bae52e9c72dad218e99879522a59ca5ed5fc0c0d..df2aebb59f836e7255ccaa6fcce545154d58b65d 100755 (executable)
@@ -553,20 +553,16 @@ class YoutubeDL(object):
                 elif template_dict.get('width'):
                     template_dict['resolution'] = '?x%d' % template_dict['width']
 
-            restrict_filenames = self.params.get('restrictfilenames')
-
             sanitize = lambda k, v: sanitize_filename(
                 compat_str(v),
-                restricted=restrict_filenames,
+                restricted=self.params.get('restrictfilenames'),
                 is_id=(k == 'id'))
             template_dict = dict((k, sanitize(k, v))
                                  for k, v in template_dict.items()
                                  if v is not None)
             template_dict = collections.defaultdict(lambda: 'NA', template_dict)
 
-            outtmpl = sanitize_filename(
-                self.params.get('outtmpl', DEFAULT_OUTTMPL),
-                restricted=restrict_filenames)
+            outtmpl = self.params.get('outtmpl', DEFAULT_OUTTMPL)
             tmpl = compat_expanduser(outtmpl)
             filename = tmpl % template_dict
             # Temporary fix for #4787