refactor: move more constants to core.constants

Signed-off-by: Dominik Willner <th33xitus@gmail.com>

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,12 +40,11 @@ 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,
 )
-from utils.types import ComponentStatus
+from core.types import ComponentStatus
 
 
 def install_crowsnest() -> None:

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

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
 
 

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,

kiauh/components/klipper/klipper_utils.py

@@ -32,14 +32,14 @@ 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
+from core.types import ComponentStatus
 
 
 def get_klipper_status() -> ComponentStatus:

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
 
 

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,

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

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,14 +41,13 @@ 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,
     install_python_requirements,
     remove_service_file,
 )
-from utils.types import ComponentStatus
+from core.types import ComponentStatus
 
 
 def install_klipperscreen() -> None:

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]:

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

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,14 +36,13 @@ 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,
     install_python_requirements,
     remove_service_file,
 )
-from utils.types import ComponentStatus
+from core.types import ComponentStatus
 
 
 def install_mobileraker() -> None:

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

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
 
 

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,

kiauh/components/moonraker/moonraker_utils.py

@@ -22,15 +22,15 @@ 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,
 )
-from utils.types import ComponentStatus
+from core.types import ComponentStatus
 
 
 def get_moonraker_status() -> ComponentStatus:

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

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,13 +34,12 @@ 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,
     parse_packages_from_file,
 )
-from utils.types import ComponentStatus
+from core.types import ComponentStatus
 
 
 def get_octoeverywhere_status() -> ComponentStatus:

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(

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:

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:

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(

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,

kiauh/components/webui_client/client_utils.py

@@ -21,16 +21,21 @@ from components.webui_client.base_data import (
 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.constants import (
+    COLOR_CYAN,
+    COLOR_YELLOW,
+    NGINX_CONFD,
+    NGINX_SITES_AVAILABLE,
+    RESET_FORMAT,
+)
+from core.logger import Logger
 from core.settings.kiauh_settings import KiauhSettings
-from utils import NGINX_CONFD, NGINX_SITES_AVAILABLE
+from core.types import ComponentStatus
 from utils.common import get_install_status
 from utils.git_utils import (
     get_latest_tag,
     get_latest_unstable_tag,
 )
-from utils.logger import Logger
-from utils.types import ComponentStatus
 
 
 def get_client_status(

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

kiauh/core/constants.py

@@ -11,6 +11,8 @@ import os
 import pwd
 from pathlib import Path
 
+from core.backup_manager import BACKUP_ROOT_DIR
+
 # text colors and formats
 COLOR_WHITE = "\033[37m"  # white
 COLOR_MAGENTA = "\033[35m"  # magenta
@@ -19,6 +21,19 @@ COLOR_YELLOW = "\033[93m"  # bright yellow
 COLOR_RED = "\033[91m"  # bright red
 COLOR_CYAN = "\033[96m"  # bright cyan
 RESET_FORMAT = "\033[0m"  # reset format
+
+# global dependencies
+GLOBAL_DEPS = ["git", "wget", "curl", "unzip", "dfu-util", "python3-virtualenv"]
+
+# strings
+INVALID_CHOICE = "Invalid choice. Please select a valid value."
+
 # current user
 CURRENT_USER = pwd.getpwuid(os.getuid())[0]
+
+# dirs
 SYSTEMD = Path("/etc/systemd/system")
+PRINTER_CFG_BACKUP_DIR = BACKUP_ROOT_DIR.joinpath("printer-cfg-backups")
+NGINX_SITES_AVAILABLE = Path("/etc/nginx/sites-available")
+NGINX_SITES_ENABLED = Path("/etc/nginx/sites-enabled")
+NGINX_CONFD = Path("/etc/nginx/conf.d")

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

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)

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:

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,8 +43,7 @@ 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
+from core.types import ComponentStatus, StatusMap, StatusText
 
 
 # noinspection PyUnusedLocal

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

kiauh/core/menus/update_menu.py

@@ -46,17 +46,17 @@ 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.spinner import Spinner
 from utils.sys_utils import (
     get_upgradable_packages,
     update_system_package_lists,
     upgrade_system_packages,
 )
-from utils.types import ComponentStatus
+from core.types import ComponentStatus
 
 
 # noinspection PyUnusedLocal
@@ -117,7 +117,7 @@ class UpdateMenu(BaseMenu):
         }
 
     def print_menu(self) -> None:
-        spinner = Spinner("Loading update menu, please wait")
+        spinner = Spinner("Loading update menu, please wait", color="green")
         spinner.start()
 
         self._fetch_update_status()

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

kiauh/core/spinner.py

@@ -0,0 +1,61 @@
+import sys
+import threading
+import time
+from typing import List, Literal
+
+from core.constants import (
+    COLOR_GREEN,
+    COLOR_RED,
+    COLOR_WHITE,
+    COLOR_YELLOW,
+    RESET_FORMAT,
+)
+
+SpinnerColor = Literal["white", "red", "green", "yellow"]
+
+
+class Spinner:
+    def __init__(
+        self,
+        message: str = "Loading",
+        color: SpinnerColor = "white",
+        interval: float = 0.2,
+    ) -> None:
+        self.message = f"{message} ..."
+        self.interval = interval
+        self._stop_event = threading.Event()
+        self._thread = threading.Thread(target=self._animate)
+        self._color = ""
+        self._set_color(color)
+
+    def _animate(self) -> None:
+        animation: List[str] = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]
+        while not self._stop_event.is_set():
+            for char in animation:
+                sys.stdout.write(f"\r{self._color}{char}{RESET_FORMAT} {self.message}")
+                sys.stdout.flush()
+                time.sleep(self.interval)
+                if self._stop_event.is_set():
+                    break
+        sys.stdout.write("\r" + " " * (len(self.message) + 1) + "\r")
+        sys.stdout.flush()
+
+    def _set_color(self, color: SpinnerColor) -> None:
+        if color == "white":
+            self._color = COLOR_WHITE
+        elif color == "red":
+            self._color = COLOR_RED
+        elif color == "green":
+            self._color = COLOR_GREEN
+        elif color == "yellow":
+            self._color = COLOR_YELLOW
+
+    def start(self) -> None:
+        self._stop_event.clear()
+        if not self._thread.is_alive():
+            self._thread = threading.Thread(target=self._animate)
+            self._thread.start()
+
+    def stop(self) -> None:
+        self._stop_event.set()
+        self._thread.join()

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

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

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
 
 

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):

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

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,

kiauh/extensions/pretty_gcode/pretty_gcode_extension.py

@@ -9,8 +9,9 @@
 import shutil
 from pathlib import Path
 
+from core.constants import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED
+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
 from utils.fs_utils import (
     create_nginx_cfg,
@@ -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

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

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,

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:

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:

kiauh/utils/__init__.py

@@ -9,15 +9,4 @@
 
 from pathlib import Path
 
-from core.backup_manager import BACKUP_ROOT_DIR
-
 MODULE_PATH = Path(__file__).resolve().parent
-INVALID_CHOICE = "Invalid choice. Please select a valid value."
-PRINTER_CFG_BACKUP_DIR = BACKUP_ROOT_DIR.joinpath("printer-cfg-backups")
-
-GLOBAL_DEPS = ["git", "wget", "curl", "unzip", "dfu-util", "python3-virtualenv"]
-
-# ================== NGINX =====================#
-NGINX_SITES_AVAILABLE = Path("/etc/nginx/sites-available")
-NGINX_SITES_ENABLED = Path("/etc/nginx/sites-enabled")
-NGINX_CONFD = Path("/etc/nginx/conf.d")

kiauh/utils/common.py

@@ -16,19 +16,20 @@ from typing import Dict, List, Literal, Optional, Set, Type
 from components.klipper.klipper import Klipper
 from core.constants import (
     COLOR_CYAN,
+    GLOBAL_DEPS,
+    PRINTER_CFG_BACKUP_DIR,
     RESET_FORMAT,
 )
 from core.instance_manager.base_instance import BaseInstance
 from core.instance_manager.instance_manager import InstanceManager
-from utils import GLOBAL_DEPS, PRINTER_CFG_BACKUP_DIR
+from core.logger import DialogType, Logger
+from core.types import ComponentStatus, StatusCode
 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,
     update_system_package_lists,
 )
-from utils.types import ComponentStatus, StatusCode
 
 
 def convert_camelcase_to_kebabcase(name: str) -> str:

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]

kiauh/utils/fs_utils.py

@@ -17,14 +17,14 @@ from typing import List
 from zipfile import ZipFile
 
 from components.klipper.klipper import Klipper
-from core.decorators import deprecated
-from utils import (
-    MODULE_PATH,
+from core.constants import (
     NGINX_CONFD,
     NGINX_SITES_AVAILABLE,
     NGINX_SITES_ENABLED,
 )
-from utils.logger import Logger
+from core.decorators import deprecated
+from core.logger import Logger
+from utils import MODULE_PATH
 
 
 def check_file_exist(file_path: Path, sudo=False) -> bool:

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(

kiauh/utils/input_utils.py

@@ -11,9 +11,8 @@ from __future__ import annotations
 import re
 from typing import Dict, List
 
-from core.constants import COLOR_CYAN, RESET_FORMAT
-from utils import INVALID_CHOICE
-from utils.logger import Logger
+from core.constants import COLOR_CYAN, INVALID_CHOICE, RESET_FORMAT
+from core.logger import Logger
 
 
 def get_confirm(question: str, default_choice=True, allow_go_back=False) -> bool | None:

kiauh/utils/spinner.py

@@ -1,34 +0,0 @@
-import sys
-import threading
-import time
-from typing import List
-
-
-class Spinner:
-    def __init__(self, message: str = "Loading", delay: float = 0.2) -> None:
-        self.message = f"{message} ..."
-        self.delay = delay
-        self._stop_event = threading.Event()
-        self._thread = threading.Thread(target=self._animate)
-
-    def _animate(self) -> None:
-        animation: List[str] = ["◜", "◝", "◞", "◟"]
-        while not self._stop_event.is_set():
-            for char in animation:
-                sys.stdout.write(f"\r{char} {self.message}")
-                sys.stdout.flush()
-                time.sleep(self.delay)
-                if self._stop_event.is_set():
-                    break
-        sys.stdout.write("\r" + " " * (len(self.message) + 1) + "\r")
-        sys.stdout.flush()
-
-    def start(self) -> None:
-        self._stop_event.clear()
-        if not self._thread.is_alive():
-            self._thread = threading.Thread(target=self._animate)
-            self._thread.start()
-
-    def stop(self) -> None:
-        self._stop_event.set()
-        self._thread.join()

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",