1
0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2024-12-22 06:27:55 +01:00

[YoutubeDL] Apply expand_path after output template substitution

os.path.expandvars translates '%%' into '%' making output template invalid.
Before: '%%(ext)s' -(expand path)-> '%(ext)s' -(outtmpl subst.)-> 'mp4'
After: '%%(ext)s' -(outtmpl subst.)-> '%(ext)s' -(expand path)-> '%(ext)s'
This commit is contained in:
Sergey M․ 2017-04-16 01:39:07 +07:00
parent 51350db5a3
commit d35dc344af
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D

View File

@ -672,8 +672,7 @@ class YoutubeDL(object):
FORMAT_RE.format(numeric_field),
r'%({0})s'.format(numeric_field), outtmpl)
tmpl = expand_path(outtmpl)
filename = tmpl % template_dict
filename = expand_path(outtmpl % template_dict)
# Temporary fix for #4787
# 'Treat' all problem characters by passing filename through preferredencoding
# to workaround encoding issues with subprocess on python2 @ Windows