From 231e9d134a382bc57d0b2da1b1dcc2847deaed59 Mon Sep 17 00:00:00 2001 From: dw-0 Date: Sun, 11 Aug 2024 16:09:30 +0200 Subject: [PATCH] refactor: move logger to core Signed-off-by: Dominik Willner --- kiauh/components/crowsnest/crowsnest.py | 2 +- kiauh/components/klipper/klipper.py | 2 +- kiauh/components/klipper/klipper_remove.py | 2 +- kiauh/components/klipper/klipper_setup.py | 2 +- kiauh/components/klipper/klipper_utils.py | 2 +- kiauh/components/klipper_firmware/firmware_utils.py | 2 +- kiauh/components/klipper_firmware/menus/klipper_build_menu.py | 2 +- kiauh/components/klipper_firmware/menus/klipper_flash_menu.py | 2 +- kiauh/components/klipperscreen/klipperscreen.py | 2 +- kiauh/components/log_uploads/log_upload_utils.py | 2 +- kiauh/components/log_uploads/menus/log_upload_menu.py | 2 +- kiauh/components/mobileraker/mobileraker.py | 2 +- kiauh/components/moonraker/moonraker.py | 2 +- kiauh/components/moonraker/moonraker_remove.py | 2 +- kiauh/components/moonraker/moonraker_setup.py | 2 +- kiauh/components/moonraker/moonraker_utils.py | 2 +- kiauh/components/octoeverywhere/octoeverywhere.py | 2 +- kiauh/components/octoeverywhere/octoeverywhere_setup.py | 2 +- .../webui_client/client_config/client_config_remove.py | 2 +- .../webui_client/client_config/client_config_setup.py | 2 +- kiauh/components/webui_client/client_dialogs.py | 2 +- kiauh/components/webui_client/client_remove.py | 2 +- kiauh/components/webui_client/client_setup.py | 2 +- kiauh/components/webui_client/client_utils.py | 2 +- kiauh/core/backup_manager/backup_manager.py | 2 +- kiauh/core/instance_manager/base_instance.py | 2 +- kiauh/core/instance_manager/instance_manager.py | 2 +- kiauh/{utils => core}/logger.py | 0 kiauh/core/menus/base_menu.py | 2 +- kiauh/core/menus/main_menu.py | 2 +- kiauh/core/menus/settings_menu.py | 2 +- kiauh/core/menus/update_menu.py | 2 +- kiauh/core/settings/kiauh_settings.py | 2 +- kiauh/extensions/extensions_menu.py | 2 +- kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py | 2 +- kiauh/extensions/klipper_backup/klipper_backup_extension.py | 2 +- .../mainsail_theme_installer_extension.py | 2 +- kiauh/extensions/obico/moonraker_obico.py | 2 +- kiauh/extensions/obico/moonraker_obico_extension.py | 2 +- kiauh/extensions/pretty_gcode/pretty_gcode_extension.py | 2 +- kiauh/extensions/telegram_bot/moonraker_telegram_bot.py | 2 +- .../extensions/telegram_bot/moonraker_telegram_bot_extension.py | 2 +- kiauh/main.py | 2 +- kiauh/procedures/system.py | 2 +- kiauh/utils/common.py | 2 +- kiauh/utils/config_utils.py | 2 +- kiauh/utils/fs_utils.py | 2 +- kiauh/utils/git_utils.py | 2 +- kiauh/utils/input_utils.py | 2 +- kiauh/utils/sys_utils.py | 2 +- 50 files changed, 49 insertions(+), 49 deletions(-) rename kiauh/{utils => core}/logger.py (100%) diff --git a/kiauh/components/crowsnest/crowsnest.py b/kiauh/components/crowsnest/crowsnest.py index b954ede..ba20db6 100644 --- a/kiauh/components/crowsnest/crowsnest.py +++ b/kiauh/components/crowsnest/crowsnest.py @@ -29,6 +29,7 @@ from components.klipper.klipper import Klipper from core.backup_manager.backup_manager import BackupManager from core.constants import CURRENT_USER from core.instance_manager.instance_manager import InstanceManager +from core.logger import DialogType, Logger from core.settings.kiauh_settings import KiauhSettings from utils.common import ( check_install_dependencies, @@ -39,7 +40,6 @@ from utils.git_utils import ( git_pull_wrapper, ) from utils.input_utils import get_confirm -from utils.logger import DialogType, Logger from utils.sys_utils import ( cmd_sysctl_service, parse_packages_from_file, diff --git a/kiauh/components/klipper/klipper.py b/kiauh/components/klipper/klipper.py index c85b3b3..bd0733a 100644 --- a/kiauh/components/klipper/klipper.py +++ b/kiauh/components/klipper/klipper.py @@ -24,7 +24,7 @@ from components.klipper import ( KLIPPER_UDS_NAME, ) from core.instance_manager.base_instance import BaseInstance -from utils.logger import Logger +from core.logger import Logger # noinspection PyMethodMayBeStatic diff --git a/kiauh/components/klipper/klipper_remove.py b/kiauh/components/klipper/klipper_remove.py index 6d9ebc5..fea7108 100644 --- a/kiauh/components/klipper/klipper_remove.py +++ b/kiauh/components/klipper/klipper_remove.py @@ -14,9 +14,9 @@ from components.klipper import KLIPPER_DIR, KLIPPER_ENV_DIR from components.klipper.klipper import Klipper from components.klipper.klipper_dialogs import print_instance_overview from core.instance_manager.instance_manager import InstanceManager +from core.logger import Logger from utils.fs_utils import run_remove_routines from utils.input_utils import get_selection_input -from utils.logger import Logger from utils.sys_utils import cmd_sysctl_manage diff --git a/kiauh/components/klipper/klipper_setup.py b/kiauh/components/klipper/klipper_setup.py index 9b3a29f..24db40b 100644 --- a/kiauh/components/klipper/klipper_setup.py +++ b/kiauh/components/klipper/klipper_setup.py @@ -35,11 +35,11 @@ from components.webui_client.client_utils import ( get_existing_clients, ) from core.instance_manager.instance_manager import InstanceManager +from core.logger import DialogType, Logger from core.settings.kiauh_settings import KiauhSettings from utils.common import check_install_dependencies from utils.git_utils import git_clone_wrapper, git_pull_wrapper from utils.input_utils import get_confirm -from utils.logger import DialogType, Logger from utils.sys_utils import ( cmd_sysctl_manage, create_python_venv, diff --git a/kiauh/components/klipper/klipper_utils.py b/kiauh/components/klipper/klipper_utils.py index 8416c38..177a9f5 100644 --- a/kiauh/components/klipper/klipper_utils.py +++ b/kiauh/components/klipper/klipper_utils.py @@ -32,12 +32,12 @@ from components.webui_client.client_config.client_config_setup import ( from core.backup_manager.backup_manager import BackupManager from core.constants import CURRENT_USER from core.instance_manager.instance_manager import InstanceManager +from core.logger import DialogType, Logger from core.submodules.simple_config_parser.src.simple_config_parser.simple_config_parser import ( SimpleConfigParser, ) from utils.common import get_install_status from utils.input_utils import get_confirm, get_number_input, get_string_input -from utils.logger import DialogType, Logger from utils.sys_utils import cmd_sysctl_service from utils.types import ComponentStatus diff --git a/kiauh/components/klipper_firmware/firmware_utils.py b/kiauh/components/klipper_firmware/firmware_utils.py index 888b195..e7a398d 100644 --- a/kiauh/components/klipper_firmware/firmware_utils.py +++ b/kiauh/components/klipper_firmware/firmware_utils.py @@ -18,7 +18,7 @@ from components.klipper_firmware.flash_options import ( FlashOptions, ) from core.instance_manager.instance_manager import InstanceManager -from utils.logger import Logger +from core.logger import Logger from utils.sys_utils import log_process diff --git a/kiauh/components/klipper_firmware/menus/klipper_build_menu.py b/kiauh/components/klipper_firmware/menus/klipper_build_menu.py index cd18303..9f099bf 100644 --- a/kiauh/components/klipper_firmware/menus/klipper_build_menu.py +++ b/kiauh/components/klipper_firmware/menus/klipper_build_menu.py @@ -18,9 +18,9 @@ from components.klipper_firmware.firmware_utils import ( run_make_menuconfig, ) from core.constants import COLOR_CYAN, COLOR_GREEN, COLOR_RED, RESET_FORMAT +from core.logger import Logger from core.menus import Option from core.menus.base_menu import BaseMenu -from utils.logger import Logger from utils.sys_utils import ( check_package_install, install_system_packages, diff --git a/kiauh/components/klipper_firmware/menus/klipper_flash_menu.py b/kiauh/components/klipper_firmware/menus/klipper_flash_menu.py index 5c0fbbd..c68bc99 100644 --- a/kiauh/components/klipper_firmware/menus/klipper_flash_menu.py +++ b/kiauh/components/klipper_firmware/menus/klipper_flash_menu.py @@ -36,10 +36,10 @@ from components.klipper_firmware.menus.klipper_flash_help_menu import ( KlipperMcuConnectionHelpMenu, ) from core.constants import COLOR_CYAN, COLOR_RED, COLOR_YELLOW, RESET_FORMAT +from core.logger import DialogType, Logger from core.menus import FooterType, Option from core.menus.base_menu import BaseMenu from utils.input_utils import get_number_input -from utils.logger import DialogType, Logger # noinspection PyUnusedLocal diff --git a/kiauh/components/klipperscreen/klipperscreen.py b/kiauh/components/klipperscreen/klipperscreen.py index 067fcf9..2828287 100644 --- a/kiauh/components/klipperscreen/klipperscreen.py +++ b/kiauh/components/klipperscreen/klipperscreen.py @@ -28,6 +28,7 @@ from components.moonraker.moonraker import Moonraker from core.backup_manager.backup_manager import BackupManager from core.constants import SYSTEMD from core.instance_manager.instance_manager import InstanceManager +from core.logger import DialogType, Logger from core.settings.kiauh_settings import KiauhSettings from utils.common import ( check_install_dependencies, @@ -40,7 +41,6 @@ from utils.git_utils import ( git_pull_wrapper, ) from utils.input_utils import get_confirm -from utils.logger import DialogType, Logger from utils.sys_utils import ( check_python_version, cmd_sysctl_service, diff --git a/kiauh/components/log_uploads/log_upload_utils.py b/kiauh/components/log_uploads/log_upload_utils.py index e54ca3a..140bc2c 100644 --- a/kiauh/components/log_uploads/log_upload_utils.py +++ b/kiauh/components/log_uploads/log_upload_utils.py @@ -14,7 +14,7 @@ from typing import List from components.klipper.klipper import Klipper from components.log_uploads import LogFile from core.instance_manager.instance_manager import InstanceManager -from utils.logger import Logger +from core.logger import Logger def get_logfile_list() -> List[LogFile]: diff --git a/kiauh/components/log_uploads/menus/log_upload_menu.py b/kiauh/components/log_uploads/menus/log_upload_menu.py index b10f239..9a3a9ce 100644 --- a/kiauh/components/log_uploads/menus/log_upload_menu.py +++ b/kiauh/components/log_uploads/menus/log_upload_menu.py @@ -13,9 +13,9 @@ from typing import Type from components.log_uploads.log_upload_utils import get_logfile_list, upload_logfile from core.constants import COLOR_YELLOW, RESET_FORMAT +from core.logger import Logger from core.menus import Option from core.menus.base_menu import BaseMenu -from utils.logger import Logger # noinspection PyMethodMayBeStatic diff --git a/kiauh/components/mobileraker/mobileraker.py b/kiauh/components/mobileraker/mobileraker.py index 2c47efb..2780521 100644 --- a/kiauh/components/mobileraker/mobileraker.py +++ b/kiauh/components/mobileraker/mobileraker.py @@ -27,6 +27,7 @@ from components.mobileraker import ( from components.moonraker.moonraker import Moonraker from core.backup_manager.backup_manager import BackupManager from core.instance_manager.instance_manager import InstanceManager +from core.logger import DialogType, Logger from core.settings.kiauh_settings import KiauhSettings from utils.common import check_install_dependencies, get_install_status from utils.config_utils import add_config_section, remove_config_section @@ -35,7 +36,6 @@ from utils.git_utils import ( git_pull_wrapper, ) from utils.input_utils import get_confirm -from utils.logger import DialogType, Logger from utils.sys_utils import ( check_python_version, cmd_sysctl_service, diff --git a/kiauh/components/moonraker/moonraker.py b/kiauh/components/moonraker/moonraker.py index 8a31dc5..659cea9 100644 --- a/kiauh/components/moonraker/moonraker.py +++ b/kiauh/components/moonraker/moonraker.py @@ -22,10 +22,10 @@ from components.moonraker import ( MOONRAKER_SERVICE_TEMPLATE, ) from core.instance_manager.base_instance import BaseInstance +from core.logger import Logger from core.submodules.simple_config_parser.src.simple_config_parser.simple_config_parser import ( SimpleConfigParser, ) -from utils.logger import Logger # noinspection PyMethodMayBeStatic diff --git a/kiauh/components/moonraker/moonraker_remove.py b/kiauh/components/moonraker/moonraker_remove.py index 0aa214c..dcecbf3 100644 --- a/kiauh/components/moonraker/moonraker_remove.py +++ b/kiauh/components/moonraker/moonraker_remove.py @@ -15,9 +15,9 @@ from components.klipper.klipper_dialogs import print_instance_overview from components.moonraker import MOONRAKER_DIR, MOONRAKER_ENV_DIR from components.moonraker.moonraker import Moonraker from core.instance_manager.instance_manager import InstanceManager +from core.logger import Logger from utils.fs_utils import run_remove_routines from utils.input_utils import get_selection_input -from utils.logger import Logger from utils.sys_utils import cmd_sysctl_manage diff --git a/kiauh/components/moonraker/moonraker_setup.py b/kiauh/components/moonraker/moonraker_setup.py index 8817658..1824d34 100644 --- a/kiauh/components/moonraker/moonraker_setup.py +++ b/kiauh/components/moonraker/moonraker_setup.py @@ -38,6 +38,7 @@ from components.webui_client.client_utils import ( ) from components.webui_client.mainsail_data import MainsailData from core.instance_manager.instance_manager import InstanceManager +from core.logger import Logger from core.settings.kiauh_settings import KiauhSettings from utils.common import check_install_dependencies from utils.fs_utils import check_file_exist @@ -46,7 +47,6 @@ from utils.input_utils import ( get_confirm, get_selection_input, ) -from utils.logger import Logger from utils.sys_utils import ( check_python_version, cmd_sysctl_manage, diff --git a/kiauh/components/moonraker/moonraker_utils.py b/kiauh/components/moonraker/moonraker_utils.py index 144d7e9..c555633 100644 --- a/kiauh/components/moonraker/moonraker_utils.py +++ b/kiauh/components/moonraker/moonraker_utils.py @@ -22,11 +22,11 @@ from components.moonraker.moonraker import Moonraker from components.webui_client.base_data import BaseWebClient from core.backup_manager.backup_manager import BackupManager from core.instance_manager.instance_manager import InstanceManager +from core.logger import Logger from core.submodules.simple_config_parser.src.simple_config_parser.simple_config_parser import ( SimpleConfigParser, ) from utils.common import get_install_status -from utils.logger import Logger from utils.sys_utils import ( get_ipv4_addr, ) diff --git a/kiauh/components/octoeverywhere/octoeverywhere.py b/kiauh/components/octoeverywhere/octoeverywhere.py index 60d7f2a..2a0e1d5 100644 --- a/kiauh/components/octoeverywhere/octoeverywhere.py +++ b/kiauh/components/octoeverywhere/octoeverywhere.py @@ -24,7 +24,7 @@ from components.octoeverywhere import ( OE_UPDATE_SCRIPT, ) from core.instance_manager.base_instance import BaseInstance -from utils.logger import Logger +from core.logger import Logger @dataclass diff --git a/kiauh/components/octoeverywhere/octoeverywhere_setup.py b/kiauh/components/octoeverywhere/octoeverywhere_setup.py index 664b757..3db6679 100644 --- a/kiauh/components/octoeverywhere/octoeverywhere_setup.py +++ b/kiauh/components/octoeverywhere/octoeverywhere_setup.py @@ -22,6 +22,7 @@ from components.octoeverywhere import ( ) from components.octoeverywhere.octoeverywhere import Octoeverywhere from core.instance_manager.instance_manager import InstanceManager +from core.logger import DialogType, Logger from utils.common import ( check_install_dependencies, get_install_status, @@ -33,7 +34,6 @@ from utils.config_utils import ( from utils.fs_utils import run_remove_routines from utils.git_utils import git_clone_wrapper from utils.input_utils import get_confirm -from utils.logger import DialogType, Logger from utils.sys_utils import ( cmd_sysctl_manage, install_python_requirements, diff --git a/kiauh/components/webui_client/client_config/client_config_remove.py b/kiauh/components/webui_client/client_config/client_config_remove.py index b0324fc..919dd72 100644 --- a/kiauh/components/webui_client/client_config/client_config_remove.py +++ b/kiauh/components/webui_client/client_config/client_config_remove.py @@ -14,9 +14,9 @@ from components.klipper.klipper import Klipper from components.moonraker.moonraker import Moonraker from components.webui_client.base_data import BaseWebClientConfig from core.instance_manager.instance_manager import InstanceManager +from core.logger import Logger from utils.config_utils import remove_config_section from utils.fs_utils import run_remove_routines -from utils.logger import Logger def run_client_config_removal( diff --git a/kiauh/components/webui_client/client_config/client_config_setup.py b/kiauh/components/webui_client/client_config/client_config_setup.py index 8989ecf..22e6fef 100644 --- a/kiauh/components/webui_client/client_config/client_config_setup.py +++ b/kiauh/components/webui_client/client_config/client_config_setup.py @@ -24,13 +24,13 @@ from components.webui_client.client_utils import ( detect_client_cfg_conflict, ) from core.instance_manager.instance_manager import InstanceManager +from core.logger import Logger from core.settings.kiauh_settings import KiauhSettings from utils.common import backup_printer_config_dir from utils.config_utils import add_config_section, add_config_section_at_top from utils.fs_utils import create_symlink from utils.git_utils import git_clone_wrapper, git_pull_wrapper from utils.input_utils import get_confirm -from utils.logger import Logger def install_client_config(client_data: BaseWebClient) -> None: diff --git a/kiauh/components/webui_client/client_dialogs.py b/kiauh/components/webui_client/client_dialogs.py index 4b330ff..f2a7b0e 100644 --- a/kiauh/components/webui_client/client_dialogs.py +++ b/kiauh/components/webui_client/client_dialogs.py @@ -10,7 +10,7 @@ from typing import List from components.webui_client.base_data import BaseWebClient -from utils.logger import DialogType, Logger +from core.logger import DialogType, Logger def print_moonraker_not_found_dialog() -> None: diff --git a/kiauh/components/webui_client/client_remove.py b/kiauh/components/webui_client/client_remove.py index 64669f8..44603de 100644 --- a/kiauh/components/webui_client/client_remove.py +++ b/kiauh/components/webui_client/client_remove.py @@ -21,13 +21,13 @@ from components.webui_client.client_config.client_config_remove import ( ) from components.webui_client.client_utils import backup_mainsail_config_json from core.instance_manager.instance_manager import InstanceManager +from core.logger import Logger from utils.config_utils import remove_config_section from utils.fs_utils import ( remove_nginx_config, remove_nginx_logs, run_remove_routines, ) -from utils.logger import Logger def run_client_removal( diff --git a/kiauh/components/webui_client/client_setup.py b/kiauh/components/webui_client/client_setup.py index f9b5fee..05a6c5e 100644 --- a/kiauh/components/webui_client/client_setup.py +++ b/kiauh/components/webui_client/client_setup.py @@ -34,6 +34,7 @@ from components.webui_client.client_utils import ( symlink_webui_nginx_log, ) from core.instance_manager.instance_manager import InstanceManager +from core.logger import Logger from core.settings.kiauh_settings import KiauhSettings from utils.common import check_install_dependencies from utils.config_utils import add_config_section @@ -47,7 +48,6 @@ from utils.fs_utils import ( unzip, ) from utils.input_utils import get_confirm, get_number_input -from utils.logger import Logger from utils.sys_utils import ( cmd_sysctl_service, download_file, diff --git a/kiauh/components/webui_client/client_utils.py b/kiauh/components/webui_client/client_utils.py index be33b5e..f89cf75 100644 --- a/kiauh/components/webui_client/client_utils.py +++ b/kiauh/components/webui_client/client_utils.py @@ -22,6 +22,7 @@ from components.webui_client.fluidd_data import FluiddData from components.webui_client.mainsail_data import MainsailData from core.backup_manager.backup_manager import BackupManager from core.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT +from core.logger import Logger from core.settings.kiauh_settings import KiauhSettings from utils import NGINX_CONFD, NGINX_SITES_AVAILABLE from utils.common import get_install_status @@ -29,7 +30,6 @@ from utils.git_utils import ( get_latest_tag, get_latest_unstable_tag, ) -from utils.logger import Logger from utils.types import ComponentStatus diff --git a/kiauh/core/backup_manager/backup_manager.py b/kiauh/core/backup_manager/backup_manager.py index 501b716..824f58c 100644 --- a/kiauh/core/backup_manager/backup_manager.py +++ b/kiauh/core/backup_manager/backup_manager.py @@ -13,8 +13,8 @@ from pathlib import Path from typing import List from core.backup_manager import BACKUP_ROOT_DIR +from core.logger import Logger from utils.common import get_current_date -from utils.logger import Logger # noinspection PyUnusedLocal diff --git a/kiauh/core/instance_manager/base_instance.py b/kiauh/core/instance_manager/base_instance.py index e306460..848fbdf 100644 --- a/kiauh/core/instance_manager/base_instance.py +++ b/kiauh/core/instance_manager/base_instance.py @@ -16,7 +16,7 @@ from pathlib import Path from typing import List from core.constants import CURRENT_USER, SYSTEMD -from utils.logger import Logger +from core.logger import Logger @dataclass diff --git a/kiauh/core/instance_manager/instance_manager.py b/kiauh/core/instance_manager/instance_manager.py index e2882dd..3bb0a52 100644 --- a/kiauh/core/instance_manager/instance_manager.py +++ b/kiauh/core/instance_manager/instance_manager.py @@ -15,7 +15,7 @@ from typing import List, Type, TypeVar from core.constants import SYSTEMD from core.instance_manager.base_instance import BaseInstance -from utils.logger import Logger +from core.logger import Logger from utils.sys_utils import cmd_sysctl_service T = TypeVar("T", bound=BaseInstance, covariant=True) diff --git a/kiauh/utils/logger.py b/kiauh/core/logger.py similarity index 100% rename from kiauh/utils/logger.py rename to kiauh/core/logger.py diff --git a/kiauh/core/menus/base_menu.py b/kiauh/core/menus/base_menu.py index 4e95de4..e7aea4a 100644 --- a/kiauh/core/menus/base_menu.py +++ b/kiauh/core/menus/base_menu.py @@ -23,8 +23,8 @@ from core.constants import ( COLOR_YELLOW, RESET_FORMAT, ) +from core.logger import Logger from core.menus import FooterType, Option -from utils.logger import Logger def clear() -> None: diff --git a/kiauh/core/menus/main_menu.py b/kiauh/core/menus/main_menu.py index 4ccf686..f648ad8 100644 --- a/kiauh/core/menus/main_menu.py +++ b/kiauh/core/menus/main_menu.py @@ -33,6 +33,7 @@ from core.constants import ( COLOR_YELLOW, RESET_FORMAT, ) +from core.logger import Logger from core.menus import FooterType from core.menus.advanced_menu import AdvancedMenu from core.menus.backup_menu import BackupMenu @@ -42,7 +43,6 @@ from core.menus.remove_menu import RemoveMenu from core.menus.settings_menu import SettingsMenu from core.menus.update_menu import UpdateMenu from extensions.extensions_menu import ExtensionsMenu -from utils.logger import Logger from utils.types import ComponentStatus, StatusMap, StatusText diff --git a/kiauh/core/menus/settings_menu.py b/kiauh/core/menus/settings_menu.py index a2f7112..9201e33 100644 --- a/kiauh/core/menus/settings_menu.py +++ b/kiauh/core/menus/settings_menu.py @@ -19,12 +19,12 @@ from components.moonraker import MOONRAKER_DIR from components.moonraker.moonraker import Moonraker from core.constants import COLOR_CYAN, COLOR_GREEN, RESET_FORMAT from core.instance_manager.instance_manager import InstanceManager +from core.logger import DialogType, Logger from core.menus import Option from core.menus.base_menu import BaseMenu from core.settings.kiauh_settings import KiauhSettings from utils.git_utils import git_clone_wrapper from utils.input_utils import get_confirm, get_string_input -from utils.logger import DialogType, Logger # noinspection PyUnusedLocal diff --git a/kiauh/core/menus/update_menu.py b/kiauh/core/menus/update_menu.py index 9a8c393..3831870 100644 --- a/kiauh/core/menus/update_menu.py +++ b/kiauh/core/menus/update_menu.py @@ -46,11 +46,11 @@ from core.constants import ( COLOR_YELLOW, RESET_FORMAT, ) +from core.logger import DialogType, Logger from core.menus import Option from core.menus.base_menu import BaseMenu from core.spinner import Spinner from utils.input_utils import get_confirm -from utils.logger import DialogType, Logger from utils.sys_utils import ( get_upgradable_packages, update_system_package_lists, diff --git a/kiauh/core/settings/kiauh_settings.py b/kiauh/core/settings/kiauh_settings.py index 156fed1..2fad91d 100644 --- a/kiauh/core/settings/kiauh_settings.py +++ b/kiauh/core/settings/kiauh_settings.py @@ -8,12 +8,12 @@ # ======================================================================= # from __future__ import annotations +from core.logger import DialogType, Logger from core.submodules.simple_config_parser.src.simple_config_parser.simple_config_parser import ( NoOptionError, NoSectionError, SimpleConfigParser, ) -from utils.logger import DialogType, Logger from utils.sys_utils import kill from kiauh import PROJECT_ROOT diff --git a/kiauh/extensions/extensions_menu.py b/kiauh/extensions/extensions_menu.py index fb78b65..d925adf 100644 --- a/kiauh/extensions/extensions_menu.py +++ b/kiauh/extensions/extensions_menu.py @@ -16,11 +16,11 @@ from pathlib import Path from typing import Dict, List, Type from core.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT +from core.logger import Logger from core.menus import Option from core.menus.base_menu import BaseMenu from extensions import EXTENSION_ROOT from extensions.base_extension import BaseExtension -from utils.logger import Logger # noinspection PyUnusedLocal diff --git a/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py b/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py index 3bfeb54..71d73be 100644 --- a/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py +++ b/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py @@ -14,6 +14,7 @@ from typing import List from components.klipper.klipper import Klipper from core.backup_manager.backup_manager import BackupManager from core.instance_manager.instance_manager import InstanceManager +from core.logger import Logger from core.submodules.simple_config_parser.src.simple_config_parser.simple_config_parser import ( SimpleConfigParser, ) @@ -27,7 +28,6 @@ from extensions.gcode_shell_cmd import ( ) from utils.fs_utils import check_file_exist from utils.input_utils import get_confirm -from utils.logger import Logger # noinspection PyMethodMayBeStatic diff --git a/kiauh/extensions/klipper_backup/klipper_backup_extension.py b/kiauh/extensions/klipper_backup/klipper_backup_extension.py index de13531..19d439d 100644 --- a/kiauh/extensions/klipper_backup/klipper_backup_extension.py +++ b/kiauh/extensions/klipper_backup/klipper_backup_extension.py @@ -13,6 +13,7 @@ import os import shutil import subprocess +from core.logger import Logger from extensions.base_extension import BaseExtension from extensions.klipper_backup import ( KLIPPERBACKUP_CONFIG_DIR, @@ -22,7 +23,6 @@ from extensions.klipper_backup import ( ) from utils.fs_utils import check_file_exist from utils.input_utils import get_confirm -from utils.logger import Logger from utils.sys_utils import service_instance_exists diff --git a/kiauh/extensions/mainsail_theme_installer/mainsail_theme_installer_extension.py b/kiauh/extensions/mainsail_theme_installer/mainsail_theme_installer_extension.py index 494debc..a44a814 100644 --- a/kiauh/extensions/mainsail_theme_installer/mainsail_theme_installer_extension.py +++ b/kiauh/extensions/mainsail_theme_installer/mainsail_theme_installer_extension.py @@ -22,12 +22,12 @@ from components.klipper.klipper_dialogs import ( from core.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT from core.instance_manager.base_instance import BaseInstance from core.instance_manager.instance_manager import InstanceManager +from core.logger import Logger from core.menus import Option from core.menus.base_menu import BaseMenu from extensions.base_extension import BaseExtension from utils.git_utils import git_clone_wrapper from utils.input_utils import get_selection_input -from utils.logger import Logger class ThemeData(TypedDict): diff --git a/kiauh/extensions/obico/moonraker_obico.py b/kiauh/extensions/obico/moonraker_obico.py index c229599..bab120b 100644 --- a/kiauh/extensions/obico/moonraker_obico.py +++ b/kiauh/extensions/obico/moonraker_obico.py @@ -13,6 +13,7 @@ from pathlib import Path from subprocess import CalledProcessError, run from core.instance_manager.base_instance import BaseInstance +from core.logger import Logger from core.submodules.simple_config_parser.src.simple_config_parser.simple_config_parser import ( SimpleConfigParser, ) @@ -26,7 +27,6 @@ from extensions.obico import ( OBICO_LOG_NAME, OBICO_SERVICE_TEMPLATE, ) -from utils.logger import Logger # noinspection PyMethodMayBeStatic diff --git a/kiauh/extensions/obico/moonraker_obico_extension.py b/kiauh/extensions/obico/moonraker_obico_extension.py index d5006fb..9399a97 100644 --- a/kiauh/extensions/obico/moonraker_obico_extension.py +++ b/kiauh/extensions/obico/moonraker_obico_extension.py @@ -12,6 +12,7 @@ from typing import List from components.klipper.klipper import Klipper from components.moonraker.moonraker import Moonraker from core.instance_manager.instance_manager import InstanceManager +from core.logger import DialogType, Logger from core.submodules.simple_config_parser.src.simple_config_parser.simple_config_parser import ( SimpleConfigParser, ) @@ -36,7 +37,6 @@ from utils.config_utils import ( from utils.fs_utils import run_remove_routines from utils.git_utils import git_clone_wrapper, git_pull_wrapper from utils.input_utils import get_confirm, get_selection_input, get_string_input -from utils.logger import DialogType, Logger from utils.sys_utils import ( cmd_sysctl_manage, create_python_venv, diff --git a/kiauh/extensions/pretty_gcode/pretty_gcode_extension.py b/kiauh/extensions/pretty_gcode/pretty_gcode_extension.py index 3dee4d6..9f5b706 100644 --- a/kiauh/extensions/pretty_gcode/pretty_gcode_extension.py +++ b/kiauh/extensions/pretty_gcode/pretty_gcode_extension.py @@ -9,6 +9,7 @@ import shutil from pathlib import Path +from core.logger import DialogType, Logger from extensions.base_extension import BaseExtension from utils import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED from utils.common import check_install_dependencies @@ -18,7 +19,6 @@ from utils.fs_utils import ( ) from utils.git_utils import git_clone_wrapper, git_pull_wrapper from utils.input_utils import get_number_input -from utils.logger import DialogType, Logger from utils.sys_utils import cmd_sysctl_service, get_ipv4_addr MODULE_PATH = Path(__file__).resolve().parent diff --git a/kiauh/extensions/telegram_bot/moonraker_telegram_bot.py b/kiauh/extensions/telegram_bot/moonraker_telegram_bot.py index 47d7177..d49a295 100644 --- a/kiauh/extensions/telegram_bot/moonraker_telegram_bot.py +++ b/kiauh/extensions/telegram_bot/moonraker_telegram_bot.py @@ -13,6 +13,7 @@ from pathlib import Path from subprocess import CalledProcessError, run from core.instance_manager.base_instance import BaseInstance +from core.logger import Logger from extensions.telegram_bot import ( TG_BOT_CFG_NAME, TG_BOT_DIR, @@ -22,7 +23,6 @@ from extensions.telegram_bot import ( TG_BOT_LOG_NAME, TG_BOT_SERVICE_TEMPLATE, ) -from utils.logger import Logger # noinspection PyMethodMayBeStatic diff --git a/kiauh/extensions/telegram_bot/moonraker_telegram_bot_extension.py b/kiauh/extensions/telegram_bot/moonraker_telegram_bot_extension.py index 716a382..7690229 100644 --- a/kiauh/extensions/telegram_bot/moonraker_telegram_bot_extension.py +++ b/kiauh/extensions/telegram_bot/moonraker_telegram_bot_extension.py @@ -12,6 +12,7 @@ from typing import List from components.moonraker.moonraker import Moonraker from core.instance_manager.instance_manager import InstanceManager +from core.logger import DialogType, Logger from extensions.base_extension import BaseExtension from extensions.telegram_bot import TG_BOT_REPO from extensions.telegram_bot.moonraker_telegram_bot import ( @@ -24,7 +25,6 @@ from utils.config_utils import add_config_section, remove_config_section from utils.fs_utils import remove_file from utils.git_utils import git_clone_wrapper, git_pull_wrapper from utils.input_utils import get_confirm -from utils.logger import DialogType, Logger from utils.sys_utils import ( cmd_sysctl_manage, create_python_venv, diff --git a/kiauh/main.py b/kiauh/main.py index 01ddf9a..7844505 100644 --- a/kiauh/main.py +++ b/kiauh/main.py @@ -7,9 +7,9 @@ # This file may be distributed under the terms of the GNU GPLv3 license # # ======================================================================= # +from core.logger import Logger from core.menus.main_menu import MainMenu from core.settings.kiauh_settings import KiauhSettings -from utils.logger import Logger def main() -> None: diff --git a/kiauh/procedures/system.py b/kiauh/procedures/system.py index e1c37a1..6c830b7 100644 --- a/kiauh/procedures/system.py +++ b/kiauh/procedures/system.py @@ -10,10 +10,10 @@ from pathlib import Path from subprocess import PIPE, CalledProcessError, run +from core.logger import DialogType, Logger from utils.common import check_install_dependencies, get_current_date from utils.fs_utils import check_file_exist from utils.input_utils import get_confirm, get_string_input -from utils.logger import DialogType, Logger def change_system_hostname() -> None: diff --git a/kiauh/utils/common.py b/kiauh/utils/common.py index 5686bf4..ec39260 100644 --- a/kiauh/utils/common.py +++ b/kiauh/utils/common.py @@ -20,9 +20,9 @@ from core.constants import ( ) from core.instance_manager.base_instance import BaseInstance from core.instance_manager.instance_manager import InstanceManager +from core.logger import DialogType, Logger from utils import GLOBAL_DEPS, PRINTER_CFG_BACKUP_DIR from utils.git_utils import get_local_commit, get_remote_commit, get_repo_name -from utils.logger import DialogType, Logger from utils.sys_utils import ( check_package_install, install_system_packages, diff --git a/kiauh/utils/config_utils.py b/kiauh/utils/config_utils.py index 6478d19..9ac824f 100644 --- a/kiauh/utils/config_utils.py +++ b/kiauh/utils/config_utils.py @@ -12,10 +12,10 @@ from typing import List, Optional, Tuple, TypeVar from components.klipper.klipper import Klipper from components.moonraker.moonraker import Moonraker +from core.logger import Logger from core.submodules.simple_config_parser.src.simple_config_parser.simple_config_parser import ( SimpleConfigParser, ) -from utils.logger import Logger B = TypeVar("B", Klipper, Moonraker) ConfigOption = Tuple[str, str] diff --git a/kiauh/utils/fs_utils.py b/kiauh/utils/fs_utils.py index 455f694..6120aa0 100644 --- a/kiauh/utils/fs_utils.py +++ b/kiauh/utils/fs_utils.py @@ -18,13 +18,13 @@ from zipfile import ZipFile from components.klipper.klipper import Klipper from core.decorators import deprecated +from core.logger import Logger from utils import ( MODULE_PATH, NGINX_CONFD, NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED, ) -from utils.logger import Logger def check_file_exist(file_path: Path, sudo=False) -> bool: diff --git a/kiauh/utils/git_utils.py b/kiauh/utils/git_utils.py index 27726a6..ed4555c 100644 --- a/kiauh/utils/git_utils.py +++ b/kiauh/utils/git_utils.py @@ -11,8 +11,8 @@ from typing import List, Type from core.instance_manager.base_instance import BaseInstance from core.instance_manager.instance_manager import InstanceManager +from core.logger import Logger from utils.input_utils import get_confirm, get_number_input -from utils.logger import Logger def git_clone_wrapper( diff --git a/kiauh/utils/input_utils.py b/kiauh/utils/input_utils.py index 6901921..366a7b0 100644 --- a/kiauh/utils/input_utils.py +++ b/kiauh/utils/input_utils.py @@ -12,8 +12,8 @@ import re from typing import Dict, List from core.constants import COLOR_CYAN, RESET_FORMAT +from core.logger import Logger from utils import INVALID_CHOICE -from utils.logger import Logger def get_confirm(question: str, default_choice=True, allow_go_back=False) -> bool | None: diff --git a/kiauh/utils/sys_utils.py b/kiauh/utils/sys_utils.py index 2b52d64..2573c58 100644 --- a/kiauh/utils/sys_utils.py +++ b/kiauh/utils/sys_utils.py @@ -22,9 +22,9 @@ from subprocess import DEVNULL, PIPE, CalledProcessError, Popen, check_output, r from typing import List, Literal, Set from core.constants import SYSTEMD +from core.logger import Logger from utils.fs_utils import check_file_exist, remove_with_sudo from utils.input_utils import get_confirm -from utils.logger import Logger SysCtlServiceAction = Literal[ "start",