kumi/yt-dlp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bug in parsing --add-header

Browse source 
Closes #1614
This commit is contained in:
pukkandan 2021-11-10 18:33:37 +05:30
parent 013ae2e503
commit 44bcb8d122
No known key found for this signature in database
GPG key ID: 0F00D95A001F4698
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
yt_dlp/options.py
View file

@ -151,25 +151,25 @@ def parseOpts(overrideArguments=None):
def _dict_from_options_callback( def _dict_from_options_callback(
option, opt_str, value, parser, option, opt_str, value, parser,
allowed_keys=r'[\w-]+', delimiter=':', default_key=None, process=None, multiple_keys=True): allowed_keys=r'[\w-]+', delimiter=':', default_key=None, process=None, multiple_keys=True,
process_key=str.lower):
out_dict = getattr(parser.values, option.dest) out_dict = getattr(parser.values, option.dest)
if multiple_keys: if multiple_keys:
allowed_keys = r'(%s)(,(%s))*' % (allowed_keys, allowed_keys) allowed_keys = r'(%s)(,(%s))*' % (allowed_keys, allowed_keys)
mobj = re.match(r'(?i)(?P<keys>%s)%s(?P<val>.*)$' % (allowed_keys, delimiter), value) mobj = re.match(r'(?i)(?P<keys>%s)%s(?P<val>.*)$' % (allowed_keys, delimiter), value)
if mobj is not None: if mobj is not None:
keys = [k.strip() for k in mobj.group('keys').lower().split(',')] keys, val = mobj.group('keys').split(','), mobj.group('val')
val = mobj.group('val')
elif default_key is not None: elif default_key is not None:
keys, val = [default_key], value keys, val = [default_key], value
else: else:
raise optparse.OptionValueError( raise optparse.OptionValueError(
'wrong %s formatting; it should be %s, not "%s"' % (opt_str, option.metavar, value)) 'wrong %s formatting; it should be %s, not "%s"' % (opt_str, option.metavar, value))
try: try:
keys = map(process_key, keys) if process_key else keys
val = process(val) if process else val val = process(val) if process else val
except Exception as err: except Exception as err:
raise optparse.OptionValueError( raise optparse.OptionValueError(f'wrong {opt_str} formatting; {err}')
'wrong %s formatting; %s' % (opt_str, err))
for key in keys: for key in keys:
out_dict[key] = val out_dict[key] = val
@ -792,7 +792,7 @@ def parseOpts(overrideArguments=None):
'--add-header', '--add-header',
metavar='FIELD:VALUE', dest='headers', default={}, type='str', metavar='FIELD:VALUE', dest='headers', default={}, type='str',
action='callback', callback=_dict_from_options_callback, action='callback', callback=_dict_from_options_callback,
callback_kwargs={'multiple_keys': False}, callback_kwargs={'multiple_keys': False, 'process_key': None},
help='Specify a custom HTTP header and its value, separated by a colon ":". You can use this option multiple times', help='Specify a custom HTTP header and its value, separated by a colon ":". You can use this option multiple times',
) )
workarounds.add_option( workarounds.add_option(