diff --git a/modules/active_modifier.py b/modules/active_modifier.py index 9aed5ba..38c50a0 100644 --- a/modules/active_modifier.py +++ b/modules/active_modifier.py @@ -1,9 +1,13 @@ from . import ActiveModifier, log95, Track, Path import os, glob, datetime +from typing import TextIO +_log_file: TextIO + from .advisor import MORNING_START, DAY_END -logger = log95.log95("AC-MOD") +assert _log_file # pyright: ignore[reportUnboundVariable] +logger = log95.log95("AC-MOD", output=_log_file) class Module(ActiveModifier): def __init__(self) -> None: diff --git a/modules/advisor.py b/modules/advisor.py index 2e2ba7c..e4020cc 100644 --- a/modules/advisor.py +++ b/modules/advisor.py @@ -2,7 +2,11 @@ from modules import ActiveModifier, InterModuleCommunication, PlayerModule from . import PlaylistAdvisor, log95, Path import os, datetime -logger = log95.log95("ADVISOR") +from typing import TextIO +_log_file: TextIO + +assert _log_file # pyright: ignore[reportUnboundVariable] +logger = log95.log95("ADVISOR", output=_log_file) MORNING_START = 5 MORNING_END = 10 diff --git a/modules/rds.py b/modules/rds.py index 15dad6d..20b32ba 100644 --- a/modules/rds.py +++ b/modules/rds.py @@ -1,5 +1,5 @@ from . import PlayerModule, log95, Track -import socket, re, os +import socket, re DEBUG = False @@ -10,8 +10,12 @@ rds_default_artist = "radio95" udp_host = ("127.0.0.1", 5000) +from typing import TextIO +_log_file: TextIO + logger_level = log95.log95Levels.DEBUG if DEBUG else log95.log95Levels.CRITICAL_ERROR -logger = log95.log95("RDS-MODULE", logger_level) +assert _log_file # pyright: ignore[reportUnboundVariable] +logger = log95.log95("RDS-MODULE", logger_level, output=_log_file) def load_dict_from_custom_format(file_path: str) -> dict[str, str]: try: diff --git a/modules/write_playlists.py b/modules/write_playlists.py index 1447bde..f68e249 100644 --- a/modules/write_playlists.py +++ b/modules/write_playlists.py @@ -1,7 +1,11 @@ from . import PlayerModule, log95, Track import os -logger = log95.log95("PlayView") +from typing import TextIO +_log_file: TextIO + +assert _log_file # pyright: ignore[reportUnboundVariable] +logger = log95.log95("PlayView", output=_log_file) class Module(PlayerModule): def __init__(self) -> None: diff --git a/radioPlayer.py b/radioPlayer.py index cacdab8..934fc52 100644 --- a/radioPlayer.py +++ b/radioPlayer.py @@ -242,6 +242,8 @@ def main(): sys.modules[MODULES_PACKAGE] = parent module.__package__ = MODULES_PACKAGE + module._log_file = log_file # type: ignore + if not spec.loader: continue try: spec.loader.exec_module(module) except Exception as e: