Miroirs/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp synced 2024-12-26 21:59:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

[cleanup] Fix flake8 and minor refactor

Browse source 
Issues from ab029d7e92, 1fb53b946c
This commit is contained in:
pukkandan 2022-09-27 08:32:57 +05:30
parent 709ee21417
commit 7a32c70d13
No known key found for this signature in database
GPG key ID: 7EEE9E1E817D0A39
2 changed files with 20 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
yt_dlp/extractor/youtube.py
View file

@ -30,6 +30,7 @@ from ..utils import (
clean_html,
datetime_from_str,
dict_get,
filter_dict,
float_or_none,
format_field,
get_first,
@ -617,7 +618,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
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 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
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):
@ -4408,8 +4399,8 @@ class YoutubeTabBaseInfoExtractor(YoutubeBaseInfoExtractor):
def _report_history_entries(self, renderer):
for url in traverse_obj(renderer, (
'rows', ..., 'reportHistoryTableRowRenderer', 'cells', ...,
'reportHistoryTableCellRenderer', 'cell', 'reportHistoryTableTextCellRenderer', 'text', 'runs', ...,
'rows', ..., 'reportHistoryTableRowRenderer', 'cells', ...,
'reportHistoryTableCellRenderer', 'cell', 'reportHistoryTableTextCellRenderer', 'text', 'runs', ...,
'navigationEndpoint', 'commandMetadata', 'webCommandMetadata', 'url')):
yield self.url_result(urljoin('https://www.youtube.com', url), YoutubeIE)
@ -4553,7 +4544,7 @@ class YoutubeTabBaseInfoExtractor(YoutubeBaseInfoExtractor):
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

22
yt_dlp/utils.py
View file

@ -5484,7 +5484,7 @@ def jwt_decode_hs256(jwt):
WINDOWS_VT_MODE = False if compat_os_name == 'nt' else None
@ functools.cache
@functools.cache
def supports_terminal_sequences(stream):
if compat_os_name == 'nt':
if not WINDOWS_VT_MODE:
@ -5634,7 +5634,7 @@ class Config:
*(f'\n{c}'.replace('\n', '\n| ')[1:] for c in self.configs),
delim='\n')
@ staticmethod
@staticmethod
def read_file(filename, default=[]):
try:
optionf = open(filename, 'rb')
@ -5655,7 +5655,7 @@ class Config:
optionf.close()
return res
@ staticmethod
@staticmethod
def hide_login_info(opts):
PRIVATE_OPTS = {'-p', '--password', '-u', '--username', '--video-password', '--ap-password', '--ap-username'}
eqre = re.compile('^(?P<key>' + ('|'.join(re.escape(po) for po in PRIVATE_OPTS)) + ')=.+$')
@ -5679,7 +5679,7 @@ class Config:
if config.init(*args):
self.configs.append(config)
@ property
@property
def all_args(self):
for config in reversed(self.configs):
yield from config.all_args
@ -5726,7 +5726,7 @@ class WebSocketsWrapper():
# taken from https://github.com/python/cpython/blob/3.9/Lib/asyncio/runners.py with modifications
# for contributors: If there's any new library using asyncio needs to be run in non-async, move these function out of this class
@ staticmethod
@staticmethod
def run_with_loop(main, loop):
if not asyncio.iscoroutine(main):
raise ValueError(f'a coroutine was expected, got {main!r}')
@ -5738,7 +5738,7 @@ class WebSocketsWrapper():
if hasattr(loop, 'shutdown_default_executor'):
loop.run_until_complete(loop.shutdown_default_executor())
@ staticmethod
@staticmethod
def _cancel_all_tasks(loop):
to_cancel = asyncio.all_tasks(loop)
@ -5772,7 +5772,7 @@ def cached_method(f):
"""Cache a method"""
signature = inspect.signature(f)
@ functools.wraps(f)
@functools.wraps(f)
def wrapper(self, *args, **kwargs):
bound_args = signature.bind(self, *args, **kwargs)
bound_args.apply_defaults()
@ -5804,7 +5804,7 @@ class Namespace(types.SimpleNamespace):
def __iter__(self):
return iter(self.__dict__.values())
@ property
@property
def items_(self):
return self.__dict__.items()
@ -5843,13 +5843,13 @@ class RetryManager:
def _should_retry(self):
return self._error is not NO_DEFAULT and self.attempt <= self.retries
@ property
@property
def error(self):
if self._error is NO_DEFAULT:
return None
return self._error
@ error.setter
@error.setter
def error(self, value):
self._error = value
@ -5861,7 +5861,7 @@ class RetryManager:
if self.error:
self.error_callback(self.error, self.attempt, self.retries)
@ staticmethod
@staticmethod
def report_retry(e, count, retries, *, sleep_func, info, warn, error=None, suffix=None):
"""Utility function for reporting retries"""
if count > retries: