[YoutubeDL] Sanitize outtmpl as path
This commit is contained in:
parent
d55de57b67
commit
1bb5c511a5
1 changed files with 3 additions and 6 deletions
|
@ -61,6 +61,7 @@ from .utils import (
|
|||
render_table,
|
||||
SameFileError,
|
||||
sanitize_filename,
|
||||
sanitize_path,
|
||||
std_headers,
|
||||
subtitles_filename,
|
||||
takewhile_inclusive,
|
||||
|
@ -553,20 +554,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 = sanitize_path(self.params.get('outtmpl', DEFAULT_OUTTMPL))
|
||||
tmpl = compat_expanduser(outtmpl)
|
||||
filename = tmpl % template_dict
|
||||
# Temporary fix for #4787
|
||||
|
|
Loading…
Reference in a new issue