From d7ca74d3d1b7144ed556bce5e85e9a41f2f0fd85 Mon Sep 17 00:00:00 2001 From: Lucas Media Date: Mon, 9 Nov 2026 20:11:14 +0100 Subject: [PATCH] feat(serverlibrary): add logging to safe_delete, style changes --- serverlibrary/src/serverlibrary/core.py | 32 +++++++++++++++++++++---- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/serverlibrary/src/serverlibrary/core.py b/serverlibrary/src/serverlibrary/core.py index de30ba7..7f12eea 100755 --- a/serverlibrary/src/serverlibrary/core.py +++ b/serverlibrary/src/serverlibrary/core.py @@ -32,12 +32,14 @@ VIDEO_RE_SUFFIXES = {f"*{suffix}" for suffix in VIDEO_SUFFIXES} # ----------------------------- TRACE = 5 + class CustomLogger(logging.Logger): def trace(self, msg: str, *args, **kwargs) -> None: if self.isEnabledFor(TRACE): kwargs.setdefault("stacklevel", 2) self._log(TRACE, msg, args, **kwargs) + LOG_LEVELS = { "TRACE": TRACE, "DEBUG": logging.DEBUG, @@ -47,7 +49,10 @@ LOG_LEVELS = { "CRITICAL": logging.CRITICAL, } -def setup_logging(log_level: str = "INFO", logfile: str | None = None, no_date: bool=True) -> None: + +def setup_logging( + log_level: str = "INFO", logfile: str | None = None, no_date: bool = True +) -> None: logging.addLevelName(TRACE, "TRACE") file_formatter = logging.Formatter("%(asctime)s %(levelname)s %(name)s %(message)s") @@ -77,9 +82,7 @@ def setup_logging(log_level: str = "INFO", logfile: str | None = None, no_date: logfile_name = f"{logfile}_{datetime.now():%Y%m%d_%H%M%S}{ext}" if no_date: logfile_name = f"{logfile}{ext}" - logfile_data = ( - Path("/home/lucas/logs/") / logfile_name - ) + logfile_data = Path("/home/lucas/logs/") / logfile_name file_handler = logging.FileHandler(logfile_data, encoding="utf-8") file_handler.setFormatter(file_formatter) @@ -89,6 +92,7 @@ def setup_logging(log_level: str = "INFO", logfile: str | None = None, no_date: root_logger.addHandler(stdout_handler) root_logger.info(f"Set logger to {log_level}, Logfile: {logfile_data}") + def parser_add_loglevel(parser): parser.add_argument( "-ll", @@ -97,6 +101,8 @@ def parser_add_loglevel(parser): default="INFO", choices=["TRACE", "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], ) + + # ----------------------------- # Media Files # ----------------------------- @@ -104,30 +110,46 @@ def parser_add_loglevel(parser): # Little Helpers # ----------------------------- + def tag(msg: str): return msg.upper() + + def red_tag(msg: str) -> str: return f"{red}[{tag(msg)}]{reset}" + def green_tag(msg: str) -> str: return f"{green}[{tag(msg)}]{reset}" + def yellow_tag(msg: str) -> str: return f"{yellow}[{tag(msg)}]{reset}" + def blue_tag(msg: str) -> str: return f"{blue}[{tag(msg)}]{reset}" + # ----------------------------- # Helpers # ----------------------------- -def safe_delete(path: Path): +def safe_delete(path: Path, logger=None): + if not path.exists(): + if logger is not None: + logger.error(f"{path} does not exist") + else: + print(f"{path} does not exist") if path.is_dir(): shutil.rmtree(path) else: path.unlink() + if logger is not None: + logger.info(f"{path} has been deleted") + else: + print(f"{path} has been deleted") def safe_rename(