diff options
Diffstat (limited to 'yt_dlp')
| -rw-r--r-- | yt_dlp/YoutubeDL.py | 6 | ||||
| -rw-r--r-- | yt_dlp/utils.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py index f60b7eec9..bf3eef67b 100644 --- a/yt_dlp/YoutubeDL.py +++ b/yt_dlp/YoutubeDL.py @@ -934,7 +934,7 @@ class YoutubeDL(object): fmt = outer_mobj.group('format') mobj = re.match(INTERNAL_FORMAT_RE, key) if mobj is None: - value, default = None, na + value, default, mobj = None, na, {'fields': ''} else: mobj = mobj.groupdict() default = mobj['default'] if mobj['default'] is not None else na @@ -944,7 +944,6 @@ class YoutubeDL(object): fmt = '0{:d}d'.format(field_size_compat_map[key]) value = default if value is None else value - key += '\0%s' % fmt if fmt == 'c': value = compat_str(value) @@ -962,7 +961,8 @@ class YoutubeDL(object): # So we convert it to repr first value, fmt = repr(value), '%ss' % fmt[:-1] if fmt[-1] in 'csr': - value = sanitize(key, value) + value = sanitize(mobj['fields'].split('.')[-1], value) + key += '\0%s' % fmt TMPL_DICT[key] = value return '%({key}){fmt}'.format(key=key, fmt=fmt) diff --git a/yt_dlp/utils.py b/yt_dlp/utils.py index 59445a1da..8e85620cc 100644 --- a/yt_dlp/utils.py +++ b/yt_dlp/utils.py @@ -6241,6 +6241,8 @@ def traverse_obj(obj, keys, *, casesense=True, is_user_input=False, traverse_str if is_user_input: key = (int_or_none(key) if ':' not in key else slice(*map(int_or_none, key.split(':')))) + if key is None: + return None if not isinstance(obj, (list, tuple)): if traverse_string: obj = compat_str(obj) |