mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-27 10:31:29 +00:00
[cleanup] Fix flake8 and minor refactor
Issues fromab029d7e92
,1fb53b946c
This commit is contained in:
parent
709ee21417
commit
7a32c70d13
|
@ -30,6 +30,7 @@
|
|||
clean_html,
|
||||
datetime_from_str,
|
||||
dict_get,
|
||||
filter_dict,
|
||||
float_or_none,
|
||||
format_field,
|
||||
get_first,
|
||||
|
@ -617,7 +618,7 @@ def generate_api_headers(
|
|||
if auth is not None:
|
||||
headers['Authorization'] = auth
|
||||
headers['X-Origin'] = origin
|
||||
return {h: v for h, v in headers.items() if v is not None}
|
||||
return filter_dict(headers)
|
||||
|
||||
def _download_ytcfg(self, client, video_id):
|
||||
url = {
|
||||
|
@ -672,20 +673,10 @@ def _extract_continuation(cls, renderer):
|
|||
if next_continuation:
|
||||
return next_continuation
|
||||
|
||||
contents = []
|
||||
for key in ('contents', 'items', 'rows'):
|
||||
contents.extend(try_get(renderer, lambda x: x[key], list) or [])
|
||||
|
||||
for content in contents:
|
||||
if not isinstance(content, dict):
|
||||
continue
|
||||
continuation_ep = try_get(
|
||||
content, (lambda x: x['continuationItemRenderer']['continuationEndpoint'],
|
||||
lambda x: x['continuationItemRenderer']['button']['buttonRenderer']['command']),
|
||||
dict)
|
||||
continuation = cls._extract_continuation_ep_data(continuation_ep)
|
||||
if continuation:
|
||||
return continuation
|
||||
return traverse_obj(renderer, (
|
||||
('contents', 'items', 'rows'), ..., 'continuationItemRenderer',
|
||||
('continuationEndpoint', ('button', 'buttonRenderer', 'command'))
|
||||
), get_all=False, expected_type=cls._extract_continuation_ep_data)
|
||||
|
||||
@classmethod
|
||||
def _extract_alerts(cls, data):
|
||||
|
@ -4553,7 +4544,7 @@ def _extract_uploader(self, data):
|
|||
uploader['uploader_url'] = urljoin(
|
||||
'https://www.youtube.com/',
|
||||
try_get(owner, lambda x: x['navigationEndpoint']['browseEndpoint']['canonicalBaseUrl'], str))
|
||||
return {k: v for k, v in uploader.items() if v is not None}
|
||||
return filter_dict(uploader)
|
||||
|
||||
def _extract_from_tabs(self, item_id, ytcfg, data, tabs):
|
||||
playlist_id = title = description = channel_url = channel_name = channel_id = None
|
||||
|
|
Loading…
Reference in a new issue