mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-27 02:42:30 +00:00
[YoutubeDL] Sanitize outtmpl as it may contain forbidden characters
This commit is contained in:
parent
8a48223a7b
commit
7dcad95d4f
@ -553,16 +553,20 @@ def prepare_filename(self, info_dict):
|
|||||||
elif template_dict.get('width'):
|
elif template_dict.get('width'):
|
||||||
template_dict['resolution'] = '?x%d' % template_dict['width']
|
template_dict['resolution'] = '?x%d' % template_dict['width']
|
||||||
|
|
||||||
|
restrict_filenames = self.params.get('restrictfilenames')
|
||||||
|
|
||||||
sanitize = lambda k, v: sanitize_filename(
|
sanitize = lambda k, v: sanitize_filename(
|
||||||
compat_str(v),
|
compat_str(v),
|
||||||
restricted=self.params.get('restrictfilenames'),
|
restricted=restrict_filenames,
|
||||||
is_id=(k == 'id'))
|
is_id=(k == 'id'))
|
||||||
template_dict = dict((k, sanitize(k, v))
|
template_dict = dict((k, sanitize(k, v))
|
||||||
for k, v in template_dict.items()
|
for k, v in template_dict.items()
|
||||||
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 = self.params.get('outtmpl', DEFAULT_OUTTMPL)
|
outtmpl = sanitize_filename(
|
||||||
|
self.params.get('outtmpl', DEFAULT_OUTTMPL),
|
||||||
|
restricted=restrict_filenames)
|
||||||
tmpl = compat_expanduser(outtmpl)
|
tmpl = compat_expanduser(outtmpl)
|
||||||
filename = tmpl % template_dict
|
filename = tmpl % template_dict
|
||||||
# Temporary fix for #4787
|
# Temporary fix for #4787
|
||||||
|
Loading…
Reference in New Issue
Block a user