1
0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2026-02-24 01:16:56 +00:00

Fix %d and empty default in outtmpl

Closes #388
This commit is contained in:
pukkandan
2021-06-09 14:43:51 +05:30
parent b5c5d84f60
commit 639f1cea92
4 changed files with 11 additions and 2 deletions

View File

@@ -936,7 +936,8 @@ class YoutubeDL(object):
# If value is an object, sanitize might convert it to a string
# So we convert it to repr first
value, fmt = repr(value), '%ss' % fmt[:-1]
value = sanitize(key, value)
if fmt[-1] in 'csr':
value = sanitize(key, value)
tmpl_dict[key] = value
return '%({key}){fmt}'.format(key=key, fmt=fmt)

View File

@@ -2107,6 +2107,8 @@ def sanitize_filename(s, restricted=False, is_id=False):
return '_'
return char
if s == '':
return ''
# Handle timestamps
s = re.sub(r'[0-9]+(?::[0-9]+)+', lambda m: m.group(0).replace(':', '_'), s)
result = ''.join(map(replace_insane, s))