mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-12-13 14:37:43 +01:00
[utils] Add variadic
This commit is contained in:
parent
73d829c144
commit
6606817a86
@ -19,7 +19,6 @@
|
|||||||
compat_etree_Element,
|
compat_etree_Element,
|
||||||
compat_etree_fromstring,
|
compat_etree_fromstring,
|
||||||
compat_getpass,
|
compat_getpass,
|
||||||
compat_integer_types,
|
|
||||||
compat_http_client,
|
compat_http_client,
|
||||||
compat_os_name,
|
compat_os_name,
|
||||||
compat_str,
|
compat_str,
|
||||||
@ -79,6 +78,7 @@
|
|||||||
urljoin,
|
urljoin,
|
||||||
url_basename,
|
url_basename,
|
||||||
url_or_none,
|
url_or_none,
|
||||||
|
variadic,
|
||||||
xpath_element,
|
xpath_element,
|
||||||
xpath_text,
|
xpath_text,
|
||||||
xpath_with_ns,
|
xpath_with_ns,
|
||||||
@ -628,14 +628,10 @@ def __can_accept_status_code(err, expected_status):
|
|||||||
assert isinstance(err, compat_urllib_error.HTTPError)
|
assert isinstance(err, compat_urllib_error.HTTPError)
|
||||||
if expected_status is None:
|
if expected_status is None:
|
||||||
return False
|
return False
|
||||||
if isinstance(expected_status, compat_integer_types):
|
|
||||||
return err.code == expected_status
|
|
||||||
elif isinstance(expected_status, (list, tuple)):
|
|
||||||
return err.code in expected_status
|
|
||||||
elif callable(expected_status):
|
elif callable(expected_status):
|
||||||
return expected_status(err.code) is True
|
return expected_status(err.code) is True
|
||||||
else:
|
else:
|
||||||
assert False
|
return err.code in variadic(expected_status)
|
||||||
|
|
||||||
def _request_webpage(self, url_or_request, video_id, note=None, errnote=None, fatal=True, data=None, headers={}, query={}, expected_status=None):
|
def _request_webpage(self, url_or_request, video_id, note=None, errnote=None, fatal=True, data=None, headers={}, query={}, expected_status=None):
|
||||||
"""
|
"""
|
||||||
@ -1207,8 +1203,7 @@ def _meta_regex(prop):
|
|||||||
[^>]+?content=(["\'])(?P<content>.*?)\2''' % re.escape(prop)
|
[^>]+?content=(["\'])(?P<content>.*?)\2''' % re.escape(prop)
|
||||||
|
|
||||||
def _og_search_property(self, prop, html, name=None, **kargs):
|
def _og_search_property(self, prop, html, name=None, **kargs):
|
||||||
if not isinstance(prop, (list, tuple)):
|
prop = variadic(prop)
|
||||||
prop = [prop]
|
|
||||||
if name is None:
|
if name is None:
|
||||||
name = 'OpenGraph %s' % prop[0]
|
name = 'OpenGraph %s' % prop[0]
|
||||||
og_regexes = []
|
og_regexes = []
|
||||||
@ -1238,8 +1233,7 @@ def _og_search_url(self, html, **kargs):
|
|||||||
return self._og_search_property('url', html, **kargs)
|
return self._og_search_property('url', html, **kargs)
|
||||||
|
|
||||||
def _html_search_meta(self, name, html, display_name=None, fatal=False, **kwargs):
|
def _html_search_meta(self, name, html, display_name=None, fatal=False, **kwargs):
|
||||||
if not isinstance(name, (list, tuple)):
|
name = variadic(name)
|
||||||
name = [name]
|
|
||||||
if display_name is None:
|
if display_name is None:
|
||||||
display_name = name[0]
|
display_name = name[0]
|
||||||
return self._html_search_regex(
|
return self._html_search_regex(
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
std_headers,
|
std_headers,
|
||||||
try_get,
|
try_get,
|
||||||
url_or_none,
|
url_or_none,
|
||||||
|
variadic,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -188,9 +189,7 @@ def _real_extract(self, url):
|
|||||||
uploader_id = media.get('owner', {}).get('username')
|
uploader_id = media.get('owner', {}).get('username')
|
||||||
|
|
||||||
def get_count(keys, kind):
|
def get_count(keys, kind):
|
||||||
if not isinstance(keys, (list, tuple)):
|
for key in variadic(keys):
|
||||||
keys = [keys]
|
|
||||||
for key in keys:
|
|
||||||
count = int_or_none(try_get(
|
count = int_or_none(try_get(
|
||||||
media, (lambda x: x['edge_media_%s' % key]['count'],
|
media, (lambda x: x['edge_media_%s' % key]['count'],
|
||||||
lambda x: x['%ss' % kind]['count'])))
|
lambda x: x['%ss' % kind]['count'])))
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
process_communicate_or_kill,
|
process_communicate_or_kill,
|
||||||
replace_extension,
|
replace_extension,
|
||||||
traverse_obj,
|
traverse_obj,
|
||||||
|
variadic,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -533,15 +534,9 @@ def run(self, info):
|
|||||||
def add(meta_list, info_list=None):
|
def add(meta_list, info_list=None):
|
||||||
if not meta_list:
|
if not meta_list:
|
||||||
return
|
return
|
||||||
if not info_list:
|
for info_f in variadic(info_list or meta_list):
|
||||||
info_list = meta_list
|
|
||||||
if not isinstance(meta_list, (list, tuple)):
|
|
||||||
meta_list = (meta_list,)
|
|
||||||
if not isinstance(info_list, (list, tuple)):
|
|
||||||
info_list = (info_list,)
|
|
||||||
for info_f in info_list:
|
|
||||||
if isinstance(info.get(info_f), (compat_str, compat_numeric_types)):
|
if isinstance(info.get(info_f), (compat_str, compat_numeric_types)):
|
||||||
for meta_f in meta_list:
|
for meta_f in variadic(meta_list):
|
||||||
metadata[meta_f] = info[info_f]
|
metadata[meta_f] = info[info_f]
|
||||||
break
|
break
|
||||||
|
|
||||||
|
@ -4289,9 +4289,7 @@ def dict_get(d, key_or_keys, default=None, skip_false_values=True):
|
|||||||
|
|
||||||
|
|
||||||
def try_get(src, getter, expected_type=None):
|
def try_get(src, getter, expected_type=None):
|
||||||
if not isinstance(getter, (list, tuple)):
|
for get in variadic(getter):
|
||||||
getter = [getter]
|
|
||||||
for get in getter:
|
|
||||||
try:
|
try:
|
||||||
v = get(src)
|
v = get(src)
|
||||||
except (AttributeError, KeyError, TypeError, IndexError):
|
except (AttributeError, KeyError, TypeError, IndexError):
|
||||||
@ -4964,11 +4962,9 @@ def cli_configuration_args(argdict, keys, default=[], use_compat=True):
|
|||||||
|
|
||||||
assert isinstance(keys, (list, tuple))
|
assert isinstance(keys, (list, tuple))
|
||||||
for key_list in keys:
|
for key_list in keys:
|
||||||
if isinstance(key_list, compat_str):
|
|
||||||
key_list = (key_list,)
|
|
||||||
arg_list = list(filter(
|
arg_list = list(filter(
|
||||||
lambda x: x is not None,
|
lambda x: x is not None,
|
||||||
[argdict.get(key.lower()) for key in key_list]))
|
[argdict.get(key.lower()) for key in variadic(key_list)]))
|
||||||
if arg_list:
|
if arg_list:
|
||||||
return [arg for args in arg_list for arg in args]
|
return [arg for args in arg_list for arg in args]
|
||||||
return default
|
return default
|
||||||
@ -6265,3 +6261,7 @@ def traverse_dict(dictn, keys, casesense=True):
|
|||||||
''' For backward compatibility. Do not use '''
|
''' For backward compatibility. Do not use '''
|
||||||
return traverse_obj(dictn, keys, casesense=casesense,
|
return traverse_obj(dictn, keys, casesense=casesense,
|
||||||
is_user_input=True, traverse_string=True)
|
is_user_input=True, traverse_string=True)
|
||||||
|
|
||||||
|
|
||||||
|
def variadic(x, allowed_types=str):
|
||||||
|
return x if isinstance(x, collections.Iterable) and not isinstance(x, allowed_types) else (x,)
|
||||||
|
Loading…
Reference in New Issue
Block a user