From e6afed66787ec674934291877483f1dcedeb59a2 Mon Sep 17 00:00:00 2001 From: kramo <93832451+kra-mo@users.noreply.github.com> Date: Thu, 15 Jun 2023 15:22:08 +0200 Subject: [PATCH] Cleanups --- src/logging/session_file_handler.py | 2 +- src/logging/setup.py | 8 ++++---- src/store/managers/manager.py | 1 + src/store/pipeline.py | 10 +++++----- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/logging/session_file_handler.py b/src/logging/session_file_handler.py index 9005c27..03bf174 100644 --- a/src/logging/session_file_handler.py +++ b/src/logging/session_file_handler.py @@ -18,7 +18,7 @@ class SessionFileHandler(StreamHandler): def create_dir(self) -> None: """Create the log dir if needed""" - self.filename.parent.mkdir(exist_ok=True) + self.filename.parent.mkdir(exist_ok=True, parents=True) def rotate_file(self, file: Path): """Rotate a file's number suffix and remove it if it's too old""" diff --git a/src/logging/setup.py b/src/logging/setup.py index da5e549..73df738 100644 --- a/src/logging/setup.py +++ b/src/logging/setup.py @@ -1,10 +1,10 @@ import logging import logging.config as logging_dot_config import os -import sys import subprocess +import sys -from src import shared +from src import shared # pylint: disable=no-name-in-module def setup_logging(): @@ -16,7 +16,7 @@ def setup_logging(): app_log_level = os.environ.get("LOGLEVEL", profile_app_log_level).upper() lib_log_level = os.environ.get("LIBLOGLEVEL", profile_lib_log_level).upper() - log_filename = shared.data_dir / "cartridges" / "logs" / "cartridges.log.xz" + log_filename = shared.cache_dir / "cartridges" / "logs" / "cartridges.log.xz" config = { "version": 1, @@ -35,7 +35,7 @@ def setup_logging(): "formatter": "file_formatter", "level": "DEBUG", "filename": log_filename, - "backup_count": 2, + "backup_count": 3, }, "app_console_handler": { "class": "logging.StreamHandler", diff --git a/src/store/managers/manager.py b/src/store/managers/manager.py index 9444ea9..b3fa098 100644 --- a/src/store/managers/manager.py +++ b/src/store/managers/manager.py @@ -110,5 +110,6 @@ class Manager: self, game: Game, additional_data: dict, callback: Callable[["Manager"], Any] ) -> None: """Pass the game through the manager""" + # TODO: connect to signals here self.execute_resilient_manager_logic(game, additional_data) callback(self) diff --git a/src/store/pipeline.py b/src/store/pipeline.py index af1b64b..4799fd2 100644 --- a/src/store/pipeline.py +++ b/src/store/pipeline.py @@ -40,12 +40,12 @@ class Pipeline(GObject.Object): def blocked(self) -> set[Manager]: """Get the managers that cannot run because their dependencies aren't done""" blocked = set() - for manager_a in self.waiting: - for manager_b in self.not_done: - if manager_a == manager_b: + for waiting in self.waiting: + for not_done in self.not_done: + if waiting == not_done: continue - if type(manager_b) in manager_a.run_after: - blocked.add(manager_a) + if type(not_done) in waiting.run_after: + blocked.add(waiting) return blocked @property