Explorar el Código

[YoutubeDL] Sanitize path after output template substitution (Closes #7367)

Sergey M․ hace 9 años
padre
commit
b3613d36da
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  1. 2 2
      youtube_dl/YoutubeDL.py

+ 2 - 2
youtube_dl/YoutubeDL.py

@@ -572,7 +572,7 @@ class YoutubeDL(object):
                                  if v is not None)
                                  if v is not None)
             template_dict = collections.defaultdict(lambda: 'NA', template_dict)
             template_dict = collections.defaultdict(lambda: 'NA', template_dict)
 
 
-            outtmpl = sanitize_path(self.params.get('outtmpl', DEFAULT_OUTTMPL))
+            outtmpl = self.params.get('outtmpl', DEFAULT_OUTTMPL)
             tmpl = compat_expanduser(outtmpl)
             tmpl = compat_expanduser(outtmpl)
             filename = tmpl % template_dict
             filename = tmpl % template_dict
             # Temporary fix for #4787
             # Temporary fix for #4787
@@ -580,7 +580,7 @@ class YoutubeDL(object):
             # to workaround encoding issues with subprocess on python2 @ Windows
             # to workaround encoding issues with subprocess on python2 @ Windows
             if sys.version_info < (3, 0) and sys.platform == 'win32':
             if sys.version_info < (3, 0) and sys.platform == 'win32':
                 filename = encodeFilename(filename, True).decode(preferredencoding())
                 filename = encodeFilename(filename, True).decode(preferredencoding())
-            return filename
+            return sanitize_path(filename)
         except ValueError as err:
         except ValueError as err:
             self.report_error('Error in output template: ' + str(err) + ' (encoding: ' + repr(preferredencoding()) + ')')
             self.report_error('Error in output template: ' + str(err) + ' (encoding: ' + repr(preferredencoding()) + ')')
             return None
             return None