attempt at fixing duplicate logging
This commit is contained in:
parent
2fa521889c
commit
2d86aaefac
3 changed files with 92 additions and 23 deletions
|
|
@ -761,7 +761,7 @@ class DownloadQueue(metaclass=Singleton):
|
||||||
"""
|
"""
|
||||||
Monitor the queue and pool for stale downloads and cancel them if needed.
|
Monitor the queue and pool for stale downloads and cancel them if needed.
|
||||||
"""
|
"""
|
||||||
if self.is_paused() or self.queue.empty():
|
if self.is_paused():
|
||||||
return
|
return
|
||||||
|
|
||||||
if not self.queue.empty():
|
if not self.queue.empty():
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
import logging
|
import logging
|
||||||
|
import weakref
|
||||||
|
from collections.abc import Callable
|
||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -8,6 +10,7 @@ class LogTarget:
|
||||||
A data class that represents a logging target with its level and type.
|
A data class that represents a logging target with its level and type.
|
||||||
|
|
||||||
Attributes:
|
Attributes:
|
||||||
|
name (str): The name of the logging target.
|
||||||
target: The logging target, which can be a logging.Logger instance or a callable.
|
target: The logging target, which can be a logging.Logger instance or a callable.
|
||||||
level (int): The logging level for the target.
|
level (int): The logging level for the target.
|
||||||
logger (bool): True if the target is a logging.Logger instance, False otherwise.
|
logger (bool): True if the target is a logging.Logger instance, False otherwise.
|
||||||
|
|
@ -15,7 +18,8 @@ class LogTarget:
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
target: "logging.Logger|callable"
|
name: str | None = None
|
||||||
|
target: logging.Logger|Callable
|
||||||
level: int
|
level: int
|
||||||
logger: bool
|
logger: bool
|
||||||
|
|
||||||
|
|
@ -55,17 +59,73 @@ class LogWrapper:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
targets: list[LogTarget] = []
|
targets: list[LogTarget] = []
|
||||||
|
"""A list of dictionaries where each dictionary represents a logging target with its level and type."""
|
||||||
|
|
||||||
def add_target(self, target: "logging.Logger|callable", level: int = logging.DEBUG):
|
def __init__(self):
|
||||||
|
self.targets: list[LogTarget] = []
|
||||||
|
weakref.finalize(self, LogWrapper.cleanup, self)
|
||||||
|
|
||||||
|
def add_target(self, target: logging.Logger | Callable, level: int = logging.DEBUG):
|
||||||
"""
|
"""
|
||||||
Adds a new logging target with the specified logging level.
|
Adds a new logging target with the specified logging level.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
target (logging.Logger|callable): The logging target, which can be a logging.Logger instance or a callable.
|
target (logging.Logger|Callable): The logging target, which can be a logging.Logger instance or a Callable.
|
||||||
level (int): The logging level for the target. Defaults to logging.DEBUG.
|
level (int): The logging level for the target. Defaults to logging.DEBUG.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
self.targets.append(LogTarget(target=target, level=level, logger=isinstance(target, logging.Logger)))
|
if not isinstance(target, logging.Logger | Callable):
|
||||||
|
msg = "Target must be a logging.Logger instance or a callable."
|
||||||
|
raise TypeError(msg)
|
||||||
|
|
||||||
|
self.targets.append(
|
||||||
|
LogTarget(
|
||||||
|
name=target.name if isinstance(target, logging.Logger) else None,
|
||||||
|
target=target,
|
||||||
|
level=level,
|
||||||
|
logger=isinstance(target, logging.Logger),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
def cleanup(self, name: str = "yt-dlp"):
|
||||||
|
"""
|
||||||
|
Remove automatic handlers
|
||||||
|
|
||||||
|
Args:
|
||||||
|
name (str): The name of the logger to clean up. Defaults to "ytdlp".
|
||||||
|
|
||||||
|
"""
|
||||||
|
mgr = logging.root.manager
|
||||||
|
to_drop = []
|
||||||
|
|
||||||
|
for tgt in list(self.targets):
|
||||||
|
# only consider real Logger targets whose name
|
||||||
|
if tgt.logger and tgt.name and tgt.name.startswith(name):
|
||||||
|
name = tgt.name
|
||||||
|
logger = tgt.target
|
||||||
|
|
||||||
|
# 1) detach all handlers.
|
||||||
|
for h in list(logger.handlers):
|
||||||
|
logger.removeHandler(h)
|
||||||
|
|
||||||
|
# 2) restore default logger settings
|
||||||
|
logger.propagate = True
|
||||||
|
logger.setLevel(logging.NOTSET)
|
||||||
|
|
||||||
|
# 3) purge logger & its children from the internal registry
|
||||||
|
for key in [k for k in mgr.loggerDict if k == name or k.startswith(name + ".")]:
|
||||||
|
mgr.loggerDict.pop(key, None)
|
||||||
|
|
||||||
|
to_drop.append(tgt)
|
||||||
|
|
||||||
|
# drop those targets from our wrapper
|
||||||
|
self.targets = [t for t in self.targets if t not in to_drop]
|
||||||
|
|
||||||
|
def __enter__(self):
|
||||||
|
return self
|
||||||
|
|
||||||
|
def __exit__(self, exc_type, exc, tb):
|
||||||
|
self.cleanup()
|
||||||
|
|
||||||
def has_targets(self):
|
def has_targets(self):
|
||||||
"""
|
"""
|
||||||
|
|
|
||||||
|
|
@ -109,6 +109,7 @@ def extract_info(
|
||||||
no_archive: bool = False,
|
no_archive: bool = False,
|
||||||
follow_redirect: bool = False,
|
follow_redirect: bool = False,
|
||||||
sanitize_info: bool = False,
|
sanitize_info: bool = False,
|
||||||
|
**kwargs,
|
||||||
) -> dict:
|
) -> dict:
|
||||||
"""
|
"""
|
||||||
Extracts video information from the given URL.
|
Extracts video information from the given URL.
|
||||||
|
|
@ -120,12 +121,14 @@ def extract_info(
|
||||||
no_archive (bool): Disable download archive.
|
no_archive (bool): Disable download archive.
|
||||||
follow_redirect (bool): Follow URL redirects.
|
follow_redirect (bool): Follow URL redirects.
|
||||||
sanitize_info (bool): Sanitize the extracted information
|
sanitize_info (bool): Sanitize the extracted information
|
||||||
|
**kwargs: Additional arguments.
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
dict: Video information.
|
dict: Video information.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
log_wrapper = LogWrapper()
|
is_recursive = bool(kwargs.get("log_wrapper"))
|
||||||
|
log_wrapper = kwargs.get("log_wrapper") or LogWrapper()
|
||||||
|
|
||||||
params: dict = {
|
params: dict = {
|
||||||
**config,
|
**config,
|
||||||
|
|
@ -141,32 +144,37 @@ def extract_info(
|
||||||
for key in keys_to_remove:
|
for key in keys_to_remove:
|
||||||
params.pop(key, None)
|
params.pop(key, None)
|
||||||
|
|
||||||
id = None
|
|
||||||
idDict = get_archive_id(url=url)
|
|
||||||
if idDict.get("id"):
|
|
||||||
id = f".{idDict['id']}"
|
|
||||||
|
|
||||||
log_wrapper.add_target(target=logging.getLogger(f"yt-dlp{id}"), level=logging.DEBUG if debug else logging.WARNING)
|
|
||||||
|
|
||||||
if debug:
|
if debug:
|
||||||
params["verbose"] = True
|
params["verbose"] = True
|
||||||
else:
|
else:
|
||||||
params["quiet"] = True
|
params["quiet"] = True
|
||||||
|
|
||||||
if "callback" in params:
|
if not is_recursive:
|
||||||
if isinstance(params["callback"], dict):
|
archive_id = None
|
||||||
log_wrapper.add_target(
|
idDict = get_archive_id(url=url)
|
||||||
target=params["callback"]["func"],
|
if idDict.get("id"):
|
||||||
level=params["callback"]["level"] or logging.ERROR,
|
archive_id = f".{idDict['id']}"
|
||||||
)
|
|
||||||
else:
|
_logger = logging.getLogger(f"yt-dlp{archive_id}")
|
||||||
log_wrapper.add_target(target=params["callback"], level=logging.ERROR)
|
_logger.propagate = False
|
||||||
del params["callback"]
|
log_wrapper.add_target(target=_logger, level=logging.DEBUG if debug else logging.WARNING)
|
||||||
|
|
||||||
|
if "callback" in params:
|
||||||
|
if isinstance(params["callback"], dict):
|
||||||
|
log_wrapper.add_target(
|
||||||
|
target=params["callback"]["func"],
|
||||||
|
level=params["callback"]["level"] or logging.ERROR,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
log_wrapper.add_target(target=params["callback"], level=logging.ERROR)
|
||||||
|
|
||||||
if log_wrapper.has_targets():
|
if log_wrapper.has_targets():
|
||||||
if "logger" in params:
|
if "logger" in params and not is_recursive:
|
||||||
log_wrapper.add_target(target=params["logger"], level=logging.DEBUG)
|
log_wrapper.add_target(target=params["logger"], level=logging.DEBUG)
|
||||||
|
|
||||||
|
if "callback" in params:
|
||||||
|
del params["callback"]
|
||||||
|
|
||||||
params["logger"] = log_wrapper
|
params["logger"] = log_wrapper
|
||||||
|
|
||||||
if no_archive and "download_archive" in params:
|
if no_archive and "download_archive" in params:
|
||||||
|
|
@ -182,6 +190,7 @@ def extract_info(
|
||||||
no_archive=no_archive,
|
no_archive=no_archive,
|
||||||
follow_redirect=follow_redirect,
|
follow_redirect=follow_redirect,
|
||||||
sanitize_info=sanitize_info,
|
sanitize_info=sanitize_info,
|
||||||
|
log_wrapper=log_wrapper,
|
||||||
)
|
)
|
||||||
|
|
||||||
if not data:
|
if not data:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue