Merge branch 'refs/heads/kiauh-v6-dev' into feat/obico-for-v6

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

.editorconfig

@@ -6,10 +6,6 @@ indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
 charset = utf-8
-end_of_line = lf
 
 [*.py]
 max_line_length = 88
-
-[*.sh]
-indent_size = 2

README.md

@@ -154,7 +154,7 @@ prompt and confirm by hitting ENTER.
 <tr>
 <th><h3><a href="https://github.com/Clon1998/mobileraker_companion">Mobileraker's Companion</a></h3></th>
 <th><h3><a href="https://octoeverywhere.com/?source=kiauh_readme">OctoEverywhere For Klipper</a></h3></th>
-<th><h3><a href="https://github.com/crysxd/OctoApp-Plugin">OctoApp For Klipper</a></h3></th>
+<th><h3><a href="https://github.com/crysxd/OctoPrint-OctoApp">OctoApp For Klipper</a></h3></th>
 <th><h3></h3></th>
 </tr>
 

docs/changelog.md

@@ -2,54 +2,13 @@
 
 This document covers possible important changes to KIAUH.
 
-### 2024-08-31 (v6.0.0-alpha.1)
-Long time no see, but here we are again!
-A lot has happened in the background, but now it is time to take it out into the wild.
-
-#### KIAUH has now reached version 6! Well, at least in an alpha state...
-
-The project has seen a complete rewrite of the script from scratch in Python.
-It requires Python 3.8 or newer to run. Because this update is still in an alpha state, bugs may or will occur.
-During startup, you will be asked if you want to start the new version 6 or the old version 5.
-As long as version 6 is in a pre-release state, version 5 will still be available. If there are any critical issues
-with the new version that were overlooked, you can always switch back to the old version.
-
-In case you selected not to get asked about which version to start (option 3 or 4 in the startup dialog) and you want to
-revert that decision, you will find a line called `version_to_launch=` within the `.kiauh.ini` file in your home directory.
-Just delete that line, save the file and restart KIAUH. KIAUH will then ask you again which version you want to start.
-
-Here is a list of the most important changes to KIAUH in regard to version 6:
-- The majority of features available in KIAUH v5 are still available; they just got migrated from Bash to Python.
-- It is now possible to add new/remove instances to/from existing multi-instance installations of Klipper and Moonraker
-- KIAUH now has an Extension-System. This allows contributors to add new installers to KIAUH without having to modify the main script.
-    - You will now find some of the features that were previously available in the Installer-Menu in the Extensions-Menu.
-    - The current extensions are:
-        - G-Code Shell Command (previously found in the Advanced-Menu)
-        - Mainsail Theme Installer (previously found in the Advanced-Menu)
-        - Klipper-Backup (new in v6!)
-        - Moonraker Telegram Bot (previously found in the Installer-Menu)
-        - PrettyGCode for Klipper (previously found in the Installer-Menu)
-        - Obico for Klipper (previously found in the Installer-Menu)
-    - The following additional extensions are planned, but not yet available:
-        - Spoolman (available in v5 in the Installer-Menu)
-        - OctoApp (available in v5 in the Installer-Menu)
-- KIAUH has its own config file now
-    - The file has some default values for the currently supported options
-    - There might be more options in the future
-    - It is located in KIAUH's root directory and is called `default.kiauh.cfg`
-        - DO NOT EDIT the default file directly, instead make a copy of it and call it `kiauh.cfg`
-        - Settings changed via the Advanced-Menu will be written to the `kiauh.cfg`
-- Support for OctoPrint was removed
-
-Feel free to give version 6 a try and report any bugs or issues you encounter! Every feedback is appreciated.
-
 ### 2023-06-17
-KIAUH has now added support for installing Mobileraker's companion!
+KIAUH has now added support for installing Mobileraker's companion! 
 Mobileraker is a free and Open Source Android and iOS App for Klipper, utilizing the Moonraker API, allowing you
 to control your printer. Thank you to [Clon1998](https://github.com/Clon1998) for adding this feature!
 
 ### 2023-02-03
-The installer for MJPG-Streamer got replaced by crowsnest. It is an improved webcam service, utilizing ustreamer.
+The installer for MJPG-Streamer got replaced by crowsnest. It is an improved webcam service, utilizing ustreamer. 
 Please have a look here for additional info about crowsnest and how to configure it: https://github.com/mainsail-crew/crowsnest \
 It's unsure if the previous MJPG-Streamer installer will be updated and make its way back into KIAUH.
 A big thanks to [KwadFan](https://github.com/KwadFan) for writing the crowsnest implementation.
@@ -156,7 +115,7 @@ membership for example caused issues when installing mjpg-streamer while not usi
 Other issues could occur when trying to flash an MCU on Debian or Ubuntu distributions where a user might not be part
 of the dialout group by default. A check for the tty group is also done. The tty group is needed for setting
 up a linux MCU (currently not yet supported by KIAUH).
-* There is an issue when trying to install Mainsail or Fluidd on Ubuntu 21.10. Permissions on that distro seem to have seen a rework
+* There is an issue when trying to install Mainsail or Fluidd on Ubuntu 21.10. Permissions on that distro seem to have seen a rework 
  in comparison to 20.04 and users will be greeted with an "Error 403 - Permission denied" message after installing one of Klippers webinterfaces.
 I still have to figure out a viable solution for that.
 

kiauh.sh

@@ -12,163 +12,97 @@
 set -e
 clear
 
-### sourcing all additional scripts
-KIAUH_SRCDIR="$(dirname -- "$(readlink -f "${BASH_SOURCE[0]}")")"
-for script in "${KIAUH_SRCDIR}/scripts/"*.sh; do . "${script}"; done
-for script in "${KIAUH_SRCDIR}/scripts/ui/"*.sh; do . "${script}"; done
-
-#===================================================#
-#=================== UPDATE KIAUH ==================#
-#===================================================#
-
-function update_kiauh() {
-  status_msg "Updating KIAUH ..."
-
-  cd "${KIAUH_SRCDIR}"
-  git reset --hard && git pull
-
-  ok_msg "Update complete! Please restart KIAUH."
-  exit 0
-}
-
-#===================================================#
-#=================== KIAUH STATUS ==================#
-#===================================================#
-
-function kiauh_update_avail() {
-  [[ ! -d "${KIAUH_SRCDIR}/.git" ]] && return
-  local origin head
-
-  cd "${KIAUH_SRCDIR}"
-
-  ### abort if not on master branch
-  ! git branch -a | grep -q "\* master" && return
-
-  ### compare commit hash
-  git fetch -q
-  origin=$(git rev-parse --short=8 origin/master)
-  head=$(git rev-parse --short=8 HEAD)
-
-  if [[ ${origin} != "${head}" ]]; then
-    echo "true"
-  fi
-}
-
-function save_startup_version() {
-  local launch_version
-
-  echo "${1}"
-
-  sed -i "/^version_to_launch=/d" "${INI_FILE}"
-  sed -i '$a'"version_to_launch=${1}" "${INI_FILE}"
-}
-
-function kiauh_update_dialog() {
-  [[ ! $(kiauh_update_avail) == "true" ]] && return
-  top_border
-  echo -e "|${green}              New KIAUH update available!              ${white}|"
-  hr
-  echo -e "|${green}  View Changelog: https://git.io/JnmlX                 ${white}|"
-  blank_line
-  echo -e "|${yellow}  It is recommended to keep KIAUH up to date. Updates  ${white}|"
-  echo -e "|${yellow}  usually contain bugfixes, important changes or new   ${white}|"
-  echo -e "|${yellow}  features. Please consider updating!                  ${white}|"
-  bottom_border
-
-  local yn
-  read -p "${cyan}###### Do you want to update now? (Y/n):${white} " yn
-  while true; do
-    case "${yn}" in
-     Y|y|Yes|yes|"")
-       do_action "update_kiauh"
-       break;;
-     N|n|No|no)
-       break;;
-     *)
-       deny_action "kiauh_update_dialog";;
-    esac
-  done
-}
-
-function launch_kiauh_v5() {
-    main_menu
-}
-
-function launch_kiauh_v6() {
+function main() {
+  local python_command
   local entrypoint
 
-  if ! command -v python3 &>/dev/null || [[ $(python3 -V | cut -d " " -f2 | cut -d "." -f2) -lt 8 ]]; then
-    echo "Python 3.8 or higher is not installed!"
-    echo "Please install Python 3.8 or higher and try again."
+  if command -v python3 &>/dev/null; then
+    python_command="python3"
+  elif command -v python &>/dev/null; then
+    python_command="python"
+  else
+    echo "Python is not installed. Please install Python and try again."
     exit 1
   fi
 
   entrypoint=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 
-  export PYTHONPATH="${entrypoint}"
-
-  clear
-  python3 "${entrypoint}/kiauh.py"
+  ${python_command} "${entrypoint}/kiauh.py"
 }
 
-function main() {
-  read_kiauh_ini "${FUNCNAME[0]}"
-
-  if [[ ${version_to_launch} -eq 5 ]]; then
-    launch_kiauh_v5
-  elif [[ ${version_to_launch} -eq 6 ]]; then
-    launch_kiauh_v6
-  else
-    top_border
-    echo -e "|         ${green}KIAUH v6.0.0-alpha1 is available now!${white}         |"
-    hr
-    echo -e "|         View Changelog: ${magenta}https://git.io/JnmlX${white}          |"
-    blank_line
-    echo -e "| KIAUH v6 was completely rewritten from the ground up. |"
-    echo -e "| It's based on Python 3.8 and has many improvements.   |"
-    blank_line
-    echo -e "| ${yellow}NOTE: Version 6 is still in alpha, so bugs may occur!${white} |"
-    echo -e "| ${yellow}Yet, your feedback and bug reports are very much${white}      |"
-    echo -e "| ${yellow}appreciated and will help finalize the release.${white}       |"
-    hr
-    echo -e "| Would you like to try out KIAUH v6?                   |"
-    echo -e "| 1) Yes                                                |"
-    echo -e "| 2) No                                                 |"
-    echo -e "| 3) Yes, remember my choice for next time              |"
-    echo -e "| 4) No, remember my choice for next time               |"
-    quit_footer
-    while true; do
-      read -p "${cyan}###### Select action:${white} " -e input
-      case "${input}" in
-        1)
-          launch_kiauh_v6
-          break;;
-        2)
-          launch_kiauh_v5
-          break;;
-        3)
-          save_startup_version 6
-          launch_kiauh_v6
-          break;;
-        4)
-          save_startup_version 5
-          launch_kiauh_v5
-          break;;
-        Q|q)
-          echo -e "${green}###### Happy printing! ######${white}"; echo
-          exit 0;;
-        *)
-          error_msg "Invalid Input!\n";;
-      esac
-    done && input=""
-  fi
-}
-
-check_if_ratos
-check_euid
-init_logfile
-set_globals
-kiauh_update_dialog
-read_kiauh_ini
-init_ini
 main
+
+#### sourcing all additional scripts
+#KIAUH_SRCDIR="$(dirname -- "$(readlink -f "${BASH_SOURCE[0]}")")"
+#for script in "${KIAUH_SRCDIR}/scripts/"*.sh; do . "${script}"; done
+#for script in "${KIAUH_SRCDIR}/scripts/ui/"*.sh; do . "${script}"; done
+#
+##===================================================#
+##=================== UPDATE KIAUH ==================#
+##===================================================#
+#
+#function update_kiauh() {
+#  status_msg "Updating KIAUH ..."
+#
+#  cd "${KIAUH_SRCDIR}"
+#  git reset --hard && git pull
+#
+#  ok_msg "Update complete! Please restart KIAUH."
+#  exit 0
+#}
+#
+##===================================================#
+##=================== KIAUH STATUS ==================#
+##===================================================#
+#
+#function kiauh_update_avail() {
+#  [[ ! -d "${KIAUH_SRCDIR}/.git" ]] && return
+#  local origin head
+#
+#  cd "${KIAUH_SRCDIR}"
+#
+#  ### abort if not on master branch
+#  ! git branch -a | grep -q "\* master" && return
+#
+#  ### compare commit hash
+#  git fetch -q
+#  origin=$(git rev-parse --short=8 origin/master)
+#  head=$(git rev-parse --short=8 HEAD)
+#
+#  if [[ ${origin} != "${head}" ]]; then
+#    echo "true"
+#  fi
+#}
+#
+#function kiauh_update_dialog() {
+#  [[ ! $(kiauh_update_avail) == "true" ]] && return
+#  top_border
+#  echo -e "|${green}              New KIAUH update available!              ${white}|"
+#  hr
+#  echo -e "|${green}  View Changelog: https://git.io/JnmlX                 ${white}|"
+#  blank_line
+#  echo -e "|${yellow}  It is recommended to keep KIAUH up to date. Updates  ${white}|"
+#  echo -e "|${yellow}  usually contain bugfixes, important changes or new   ${white}|"
+#  echo -e "|${yellow}  features. Please consider updating!                  ${white}|"
+#  bottom_border
+#
+#  local yn
+#  read -p "${cyan}###### Do you want to update now? (Y/n):${white} " yn
+#  while true; do
+#    case "${yn}" in
+#      Y|y|Yes|yes|"")
+#        do_action "update_kiauh"
+#        break;;
+#      N|n|No|no)
+#        break;;
+#      *)
+#        deny_action "kiauh_update_dialog";;
+#    esac
+#  done
+#}
+#
+#check_euid
+#init_logfile
+#set_globals
+#kiauh_update_dialog
+#main_menu

kiauh/components/crowsnest/__init__.py

@@ -10,21 +10,7 @@
 from pathlib import Path
 
 from core.backup_manager import BACKUP_ROOT_DIR
-from core.constants import SYSTEMD
 
-# repo
-CROWSNEST_REPO = "https://github.com/mainsail-crew/crowsnest.git"
-
-# names
-CROWSNEST_SERVICE_NAME = "crowsnest.service"
-
-# directories
 CROWSNEST_DIR = Path.home().joinpath("crowsnest")
+CROWSNEST_REPO = "https://github.com/mainsail-crew/crowsnest.git"
 CROWSNEST_BACKUP_DIR = BACKUP_ROOT_DIR.joinpath("crowsnest-backups")
-
-# files
-CROWSNEST_MULTI_CONFIG = CROWSNEST_DIR.joinpath("tools/.config")
-CROWSNEST_INSTALL_SCRIPT = CROWSNEST_DIR.joinpath("tools/install.sh")
-CROWSNEST_BIN_FILE = Path("/usr/local/bin/crowsnest")
-CROWSNEST_LOGROTATE_FILE = Path("/etc/logrotate.d/crowsnest")
-CROWSNEST_SERVICE_FILE = SYSTEMD.joinpath(CROWSNEST_SERVICE_NAME)

kiauh/components/crowsnest/crowsnest.py

@@ -14,37 +14,27 @@ from pathlib import Path
 from subprocess import CalledProcessError, run
 from typing import List
 
-from components.crowsnest import (
-    CROWSNEST_BACKUP_DIR,
-    CROWSNEST_BIN_FILE,
-    CROWSNEST_DIR,
-    CROWSNEST_INSTALL_SCRIPT,
-    CROWSNEST_LOGROTATE_FILE,
-    CROWSNEST_MULTI_CONFIG,
-    CROWSNEST_REPO,
-    CROWSNEST_SERVICE_FILE,
-    CROWSNEST_SERVICE_NAME,
-)
+from components.crowsnest import CROWSNEST_BACKUP_DIR, CROWSNEST_DIR, CROWSNEST_REPO
 from components.klipper.klipper import Klipper
 from core.backup_manager.backup_manager import BackupManager
-from core.constants import CURRENT_USER
-from core.logger import DialogType, Logger
+from core.instance_manager.instance_manager import InstanceManager
 from core.settings.kiauh_settings import KiauhSettings
-from core.types import ComponentStatus
 from utils.common import (
     check_install_dependencies,
     get_install_status,
 )
+from utils.constants import CURRENT_USER
 from utils.git_utils import (
     git_clone_wrapper,
     git_pull_wrapper,
 )
 from utils.input_utils import get_confirm
-from utils.instance_utils import get_instances
+from utils.logger import DialogType, Logger
 from utils.sys_utils import (
     cmd_sysctl_service,
     parse_packages_from_file,
 )
+from utils.types import ComponentStatus
 
 
 def install_crowsnest() -> None:
@@ -52,10 +42,11 @@ def install_crowsnest() -> None:
     git_clone_wrapper(CROWSNEST_REPO, CROWSNEST_DIR, "master")
 
     # Step 2: Install dependencies
-    check_install_dependencies({"make"})
+    check_install_dependencies(["make"])
 
     # Step 3: Check for Multi Instance
-    instances: List[Klipper] = get_instances(Klipper)
+    im = InstanceManager(Klipper)
+    instances: List[Klipper] = im.instances
 
     if len(instances) > 1:
         print_multi_instance_warning(instances)
@@ -84,6 +75,7 @@ def install_crowsnest() -> None:
 
 
 def print_multi_instance_warning(instances: List[Klipper]) -> None:
+    _instances = [f"● {instance.data_dir_name}" for instance in instances]
     Logger.print_dialog(
         DialogType.WARNING,
         [
@@ -94,12 +86,14 @@ def print_multi_instance_warning(instances: List[Klipper]) -> None:
             "this instance to set up your 'crowsnest.conf' and steering it's service.",
             "\n\n",
             "The following instances were found:",
-            *[f"● {instance.data_dir.name}" for instance in instances],
+            *_instances,
         ],
+        end="",
     )
 
 
 def configure_multi_instance() -> None:
+    config = Path(CROWSNEST_DIR).joinpath("tools/.config")
     try:
         run(
             "make config",
@@ -109,17 +103,17 @@ def configure_multi_instance() -> None:
         )
     except CalledProcessError as e:
         Logger.print_error(f"Something went wrong! Please try again...\n{e}")
-        if CROWSNEST_MULTI_CONFIG.exists():
-            Path.unlink(CROWSNEST_MULTI_CONFIG)
+        if config.exists():
+            Path.unlink(config)
         return
 
-    if not CROWSNEST_MULTI_CONFIG.exists():
+    if not config.exists():
         Logger.print_error("Generating .config failed, installation aborted")
 
 
 def update_crowsnest() -> None:
     try:
-        cmd_sysctl_service(CROWSNEST_SERVICE_NAME, "stop")
+        cmd_sysctl_service("crowsnest", "stop")
 
         if not CROWSNEST_DIR.exists():
             git_clone_wrapper(CROWSNEST_REPO, CROWSNEST_DIR, "master")
@@ -130,17 +124,18 @@ def update_crowsnest() -> None:
             if settings.kiauh.backup_before_update:
                 bm = BackupManager()
                 bm.backup_directory(
-                    CROWSNEST_DIR.name,
+                    "crowsnest",
                     source=CROWSNEST_DIR,
                     target=CROWSNEST_BACKUP_DIR,
                 )
 
             git_pull_wrapper(CROWSNEST_REPO, CROWSNEST_DIR)
 
-            deps = parse_packages_from_file(CROWSNEST_INSTALL_SCRIPT)
-            check_install_dependencies({*deps})
+            script = CROWSNEST_DIR.joinpath("tools/install.sh")
+            deps = parse_packages_from_file(script)
+            check_install_dependencies(deps)
 
-        cmd_sysctl_service(CROWSNEST_SERVICE_NAME, "restart")
+        cmd_sysctl_service("crowsnest", "restart")
 
         Logger.print_ok("Crowsnest updated successfully.", end="\n\n")
     except CalledProcessError as e:
@@ -150,9 +145,9 @@ def update_crowsnest() -> None:
 
 def get_crowsnest_status() -> ComponentStatus:
     files = [
-        CROWSNEST_BIN_FILE,
-        CROWSNEST_LOGROTATE_FILE,
-        CROWSNEST_SERVICE_FILE,
+        Path("/usr/local/bin/crowsnest"),
+        Path("/etc/logrotate.d/crowsnest"),
+        Path("/etc/systemd/system/crowsnest.service"),
     ]
     return get_install_status(CROWSNEST_DIR, files=files)
 

kiauh/components/klipper/__init__.py

@@ -13,24 +13,9 @@ from core.backup_manager import BACKUP_ROOT_DIR
 
 MODULE_PATH = Path(__file__).resolve().parent
 
-# names
-KLIPPER_LOG_NAME = "klippy.log"
-KLIPPER_CFG_NAME = "printer.cfg"
-KLIPPER_SERIAL_NAME = "klippy.serial"
-KLIPPER_UDS_NAME = "klippy.sock"
-KLIPPER_ENV_FILE_NAME = "klipper.env"
-KLIPPER_SERVICE_NAME = "klipper.service"
-
-# directories
 KLIPPER_DIR = Path.home().joinpath("klipper")
 KLIPPER_ENV_DIR = Path.home().joinpath("klippy-env")
 KLIPPER_BACKUP_DIR = BACKUP_ROOT_DIR.joinpath("klipper-backups")
-
-# files
-KLIPPER_REQ_FILE = KLIPPER_DIR.joinpath("scripts/klippy-requirements.txt")
-KLIPPER_INSTALL_SCRIPT = KLIPPER_DIR.joinpath("scripts/install-ubuntu-22.04.sh")
-KLIPPER_SERVICE_TEMPLATE = MODULE_PATH.joinpath(f"assets/{KLIPPER_SERVICE_NAME}")
-KLIPPER_ENV_FILE_TEMPLATE = MODULE_PATH.joinpath(f"assets/{KLIPPER_ENV_FILE_NAME}")
-
+KLIPPER_REQUIREMENTS_TXT = KLIPPER_DIR.joinpath("scripts/klippy-requirements.txt")
 
 EXIT_KLIPPER_SETUP = "Exiting Klipper setup ..."

kiauh/components/klipper/klipper.py

@@ -6,135 +6,147 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
-from dataclasses import dataclass, field
+import subprocess
 from pathlib import Path
-from subprocess import CalledProcessError
+from typing import List
 
-from components.klipper import (
-    KLIPPER_CFG_NAME,
-    KLIPPER_DIR,
-    KLIPPER_ENV_DIR,
-    KLIPPER_ENV_FILE_NAME,
-    KLIPPER_ENV_FILE_TEMPLATE,
-    KLIPPER_LOG_NAME,
-    KLIPPER_SERIAL_NAME,
-    KLIPPER_SERVICE_TEMPLATE,
-    KLIPPER_UDS_NAME,
-)
-from core.constants import CURRENT_USER
+from components.klipper import KLIPPER_DIR, KLIPPER_ENV_DIR, MODULE_PATH
 from core.instance_manager.base_instance import BaseInstance
-from core.logger import Logger
-from utils.fs_utils import create_folders, get_data_dir
-from utils.sys_utils import get_service_file_path
+from utils.constants import SYSTEMD
+from utils.logger import Logger
 
 
 # noinspection PyMethodMayBeStatic
-@dataclass(repr=True)
-class Klipper:
-    suffix: str
-    base: BaseInstance = field(init=False, repr=False)
-    service_file_path: Path = field(init=False)
-    log_file_name: str = KLIPPER_LOG_NAME
-    klipper_dir: Path = KLIPPER_DIR
-    env_dir: Path = KLIPPER_ENV_DIR
-    data_dir: Path = field(init=False)
-    cfg_file: Path = field(init=False)
-    serial: Path = field(init=False)
-    uds: Path = field(init=False)
+class Klipper(BaseInstance):
+    @classmethod
+    def blacklist(cls) -> List[str]:
+        return ["None", "mcu"]
 
-    def __post_init__(self):
-        self.base: BaseInstance = BaseInstance(Klipper, self.suffix)
-        self.base.log_file_name = self.log_file_name
+    def __init__(self, suffix: str = ""):
+        super().__init__(instance_type=self, suffix=suffix)
+        self.klipper_dir: Path = KLIPPER_DIR
+        self.env_dir: Path = KLIPPER_ENV_DIR
+        self._cfg_file = self.cfg_dir.joinpath("printer.cfg")
+        self._log = self.log_dir.joinpath("klippy.log")
+        self._serial = self.comms_dir.joinpath("klippy.serial")
+        self._uds = self.comms_dir.joinpath("klippy.sock")
 
-        self.service_file_path: Path = get_service_file_path(Klipper, self.suffix)
-        self.data_dir: Path = get_data_dir(Klipper, self.suffix)
-        self.cfg_file: Path = self.base.cfg_dir.joinpath(KLIPPER_CFG_NAME)
-        self.serial: Path = self.base.comms_dir.joinpath(KLIPPER_SERIAL_NAME)
-        self.uds: Path = self.base.comms_dir.joinpath(KLIPPER_UDS_NAME)
+    @property
+    def cfg_file(self) -> Path:
+        return self._cfg_file
+
+    @property
+    def log(self) -> Path:
+        return self._log
+
+    @property
+    def serial(self) -> Path:
+        return self._serial
+
+    @property
+    def uds(self) -> Path:
+        return self._uds
 
     def create(self) -> None:
-        from utils.sys_utils import create_env_file, create_service_file
-
         Logger.print_status("Creating new Klipper Instance ...")
+        service_template_path = MODULE_PATH.joinpath("assets/klipper.service")
+        service_file_name = self.get_service_file_name(extension=True)
+        service_file_target = SYSTEMD.joinpath(service_file_name)
+        env_template_file_path = MODULE_PATH.joinpath("assets/klipper.env")
+        env_file_target = self.sysd_dir.joinpath("klipper.env")
 
         try:
-            create_folders(self.base.base_folders)
-
-            create_service_file(
-                name=self.service_file_path.name,
-                content=self._prep_service_file_content(),
+            self.create_folders()
+            self.write_service_file(
+                service_template_path, service_file_target, env_file_target
             )
+            self.write_env_file(env_template_file_path, env_file_target)
 
-            create_env_file(
-                path=self.base.sysd_dir.joinpath(KLIPPER_ENV_FILE_NAME),
-                content=self._prep_env_file_content(),
+        except subprocess.CalledProcessError as e:
+            Logger.print_error(
+                f"Error creating service file {service_file_target}: {e}"
             )
-
-        except CalledProcessError as e:
-            Logger.print_error(f"Error creating instance: {e}")
             raise
         except OSError as e:
-            Logger.print_error(f"Error creating env file: {e}")
+            Logger.print_error(f"Error creating env file {env_file_target}: {e}")
             raise
 
-    def _prep_service_file_content(self) -> str:
-        template = KLIPPER_SERVICE_TEMPLATE
+    def delete(self) -> None:
+        service_file = self.get_service_file_name(extension=True)
+        service_file_path = self.get_service_file_path()
+
+        Logger.print_status(f"Deleting Klipper Instance: {service_file}")
 
         try:
-            with open(template, "r") as template_file:
+            command = ["sudo", "rm", "-f", service_file_path]
+            subprocess.run(command, check=True)
+            Logger.print_ok(f"Service file deleted: {service_file_path}")
+        except subprocess.CalledProcessError as e:
+            Logger.print_error(f"Error deleting service file: {e}")
+            raise
+
+    def write_service_file(
+        self,
+        service_template_path: Path,
+        service_file_target: Path,
+        env_file_target: Path,
+    ) -> None:
+        service_content = self._prep_service_file(
+            service_template_path, env_file_target
+        )
+        command = ["sudo", "tee", service_file_target]
+        subprocess.run(
+            command,
+            input=service_content.encode(),
+            stdout=subprocess.DEVNULL,
+            check=True,
+        )
+        Logger.print_ok(f"Service file created: {service_file_target}")
+
+    def write_env_file(
+        self, env_template_file_path: Path, env_file_target: Path
+    ) -> None:
+        env_file_content = self._prep_env_file(env_template_file_path)
+        with open(env_file_target, "w") as env_file:
+            env_file.write(env_file_content)
+        Logger.print_ok(f"Env file created: {env_file_target}")
+
+    def _prep_service_file(
+        self, service_template_path: Path, env_file_path: Path
+    ) -> str:
+        try:
+            with open(service_template_path, "r") as template_file:
                 template_content = template_file.read()
         except FileNotFoundError:
-            Logger.print_error(f"Unable to open {template} - File not found")
+            Logger.print_error(
+                f"Unable to open {service_template_path} - File not found"
+            )
             raise
-
-        service_content = template_content.replace(
-            "%USER%",
-            CURRENT_USER,
-        )
+        service_content = template_content.replace("%USER%", self.user)
         service_content = service_content.replace(
-            "%KLIPPER_DIR%",
-            self.klipper_dir.as_posix(),
-        )
-        service_content = service_content.replace(
-            "%ENV%",
-            self.env_dir.as_posix(),
-        )
-        service_content = service_content.replace(
-            "%ENV_FILE%",
-            self.base.sysd_dir.joinpath(KLIPPER_ENV_FILE_NAME).as_posix(),
+            "%KLIPPER_DIR%", str(self.klipper_dir)
         )
+        service_content = service_content.replace("%ENV%", str(self.env_dir))
+        service_content = service_content.replace("%ENV_FILE%", str(env_file_path))
         return service_content
 
-    def _prep_env_file_content(self) -> str:
-        template = KLIPPER_ENV_FILE_TEMPLATE
-
+    def _prep_env_file(self, env_template_file_path: Path) -> str:
         try:
-            with open(template, "r") as env_file:
+            with open(env_template_file_path, "r") as env_file:
                 env_template_file_content = env_file.read()
         except FileNotFoundError:
-            Logger.print_error(f"Unable to open {template} - File not found")
+            Logger.print_error(
+                f"Unable to open {env_template_file_path} - File not found"
+            )
             raise
-
         env_file_content = env_template_file_content.replace(
-            "%KLIPPER_DIR%", self.klipper_dir.as_posix()
+            "%KLIPPER_DIR%", str(self.klipper_dir)
         )
         env_file_content = env_file_content.replace(
-            "%CFG%",
-            f"{self.base.cfg_dir}/{KLIPPER_CFG_NAME}",
+            "%CFG%", f"{self.cfg_dir}/printer.cfg"
         )
-        env_file_content = env_file_content.replace(
-            "%SERIAL%",
-            self.serial.as_posix() if self.serial else "",
-        )
-        env_file_content = env_file_content.replace(
-            "%LOG%",
-            self.base.log_dir.joinpath(self.log_file_name).as_posix(),
-        )
-        env_file_content = env_file_content.replace(
-            "%UDS%",
-            self.uds.as_posix() if self.uds else "",
-        )
-
+        env_file_content = env_file_content.replace("%SERIAL%", str(self.serial))
+        env_file_content = env_file_content.replace("%LOG%", str(self.log))
+        env_file_content = env_file_content.replace("%UDS%", str(self.uds))
         return env_file_content

kiauh/components/klipper/klipper_dialogs.py

@@ -11,14 +11,14 @@ import textwrap
 from enum import Enum, unique
 from typing import List
 
-from core.constants import (
+from core.instance_manager.base_instance import BaseInstance
+from core.menus.base_menu import print_back_footer
+from utils.constants import (
     COLOR_CYAN,
     COLOR_GREEN,
     COLOR_YELLOW,
     RESET_FORMAT,
 )
-from core.instance_type import InstanceType
-from core.menus.base_menu import print_back_footer
 
 
 @unique
@@ -28,13 +28,12 @@ class DisplayType(Enum):
 
 
 def print_instance_overview(
-    instances: List[InstanceType],
+    instances: List[BaseInstance],
     display_type: DisplayType = DisplayType.SERVICE_NAME,
     show_headline=True,
     show_index=False,
-    start_index=0,
     show_select_all=False,
-) -> None:
+):
     dialog = "╔═══════════════════════════════════════════════════════╗\n"
     if show_headline:
         d_type = (
@@ -53,10 +52,10 @@ def print_instance_overview(
 
     for i, s in enumerate(instances):
         if display_type is DisplayType.SERVICE_NAME:
-            name = s.service_file_path.stem
+            name = s.get_service_file_name()
         else:
             name = s.data_dir
-        line = f"{COLOR_CYAN}{f'{i + start_index})' if show_index else '●'} {name}{RESET_FORMAT}"
+        line = f"{COLOR_CYAN}{f'{i})' if show_index else '●'} {name}{RESET_FORMAT}"
         dialog += f"║ {line:<63}║\n"
     dialog += "╟───────────────────────────────────────────────────────╢\n"
 
@@ -64,7 +63,7 @@ def print_instance_overview(
     print_back_footer()
 
 
-def print_select_instance_count_dialog() -> None:
+def print_select_instance_count_dialog():
     line1 = f"{COLOR_YELLOW}WARNING:{RESET_FORMAT}"
     line2 = f"{COLOR_YELLOW}Setting up too many instances may crash your system.{RESET_FORMAT}"
     dialog = textwrap.dedent(
@@ -84,25 +83,15 @@ def print_select_instance_count_dialog() -> None:
     print_back_footer()
 
 
-def print_select_custom_name_dialog() -> None:
+def print_select_custom_name_dialog():
     line1 = f"{COLOR_YELLOW}INFO:{RESET_FORMAT}"
     line2 = f"{COLOR_YELLOW}Only alphanumeric characters are allowed!{RESET_FORMAT}"
     dialog = textwrap.dedent(
         f"""
         ╔═══════════════════════════════════════════════════════╗
-        ║ Do you want to assign a custom name to each instance? ║
-        ║                                                       ║
-        ║ Assigning a custom name will create a Klipper service ║
-        ║ and a printer directory with the chosen name.         ║
-        ║                                                       ║
-        ║ Example for custom name 'kiauh':                      ║
-        ║  ● Klipper service:   klipper-kiauh.service           ║
-        ║  ● Printer directory: printer_kiauh_data              ║
-        ║                                                       ║
+        ║ You can now assign a custom name to each instance.    ║
         ║ If skipped, each instance will get an index assigned  ║
-        ║ in ascending order, starting at '1' in case of a new  ║
-        ║ installation. Otherwise, the index will be derived    ║
-        ║ from amount of already existing instances.            ║
+        ║ in ascending order, starting at index '1'.            ║
         ║                                                       ║
         ║ {line1:<63}║
         ║ {line2:<63}║

kiauh/components/klipper/klipper_remove.py

@@ -6,93 +6,126 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
-from typing import List
+import shutil
+from typing import List, Union
 
 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.fs_utils import remove_file
 from utils.input_utils import get_selection_input
-from utils.instance_utils import get_instances
-from utils.sys_utils import unit_file_exists
+from utils.logger import Logger
+from utils.sys_utils import cmd_sysctl_manage
 
 
 def run_klipper_removal(
     remove_service: bool,
     remove_dir: bool,
     remove_env: bool,
+    delete_logs: bool,
 ) -> None:
-    klipper_instances: List[Klipper] = get_instances(Klipper)
+    im = InstanceManager(Klipper)
 
     if remove_service:
         Logger.print_status("Removing Klipper instances ...")
-        if klipper_instances:
-            instances_to_remove = select_instances_to_remove(klipper_instances)
-            remove_instances(instances_to_remove)
+        if im.instances:
+            instances_to_remove = select_instances_to_remove(im.instances)
+            remove_instances(im, instances_to_remove)
         else:
             Logger.print_info("No Klipper Services installed! Skipped ...")
 
-    if (remove_dir or remove_env) and unit_file_exists("klipper", suffix="service"):
-        Logger.print_info("There are still other Klipper services installed:")
-        Logger.print_info(f"● '{KLIPPER_DIR}' was not removed.", prefix=False)
-        Logger.print_info(f"● '{KLIPPER_ENV_DIR}' was not removed.", prefix=False)
+    if (remove_dir or remove_env) and im.instances:
+        Logger.print_warn("There are still other Klipper services installed!")
+        Logger.print_warn("Therefor the following parts cannot be removed:")
+        Logger.print_warn(
+            """
+            ● Klipper local repository
+            ● Klipper Python environment
+            """,
+            False,
+        )
     else:
         if remove_dir:
             Logger.print_status("Removing Klipper local repository ...")
-            run_remove_routines(KLIPPER_DIR)
+            remove_klipper_dir()
         if remove_env:
             Logger.print_status("Removing Klipper Python environment ...")
-            run_remove_routines(KLIPPER_ENV_DIR)
+            remove_klipper_env()
+
+    # delete klipper logs of all instances
+    if delete_logs:
+        Logger.print_status("Removing all Klipper logs ...")
+        delete_klipper_logs(im.instances)
 
 
-def select_instances_to_remove(instances: List[Klipper]) -> List[Klipper] | None:
-    start_index = 1
-    options = [str(i + start_index) for i in range(len(instances))]
-    options.extend(["a", "b"])
-    instance_map = {options[i]: instances[i] for i in range(len(instances))}
+def select_instances_to_remove(
+    instances: List[Klipper],
+) -> Union[List[Klipper], None]:
+    print_instance_overview(instances, show_index=True, show_select_all=True)
+
+    options = [str(i) for i in range(len(instances))]
+    options.extend(["a", "A", "b", "B"])
 
-    print_instance_overview(
-        instances,
-        start_index=start_index,
-        show_index=True,
-        show_select_all=True,
-    )
     selection = get_selection_input("Select Klipper instance to remove", options)
 
     instances_to_remove = []
-    if selection == "b":
+    if selection == "b".lower():
         return None
-    elif selection == "a":
+    elif selection == "a".lower():
         instances_to_remove.extend(instances)
     else:
-        instances_to_remove.append(instance_map[selection])
+        instance = instances[int(selection)]
+        instances_to_remove.append(instance)
 
     return instances_to_remove
 
 
 def remove_instances(
-    instance_list: List[Klipper] | None,
+    instance_manager: InstanceManager,
+    instance_list: List[Klipper],
 ) -> None:
-    if not instance_list:
+    for instance in instance_list:
+        Logger.print_status(f"Removing instance {instance.get_service_file_name()} ...")
+        instance_manager.current_instance = instance
+        instance_manager.stop_instance()
+        instance_manager.disable_instance()
+        instance_manager.delete_instance()
+
+    cmd_sysctl_manage("daemon-reload")
+
+
+def remove_klipper_dir() -> None:
+    if not KLIPPER_DIR.exists():
+        Logger.print_info(f"'{KLIPPER_DIR}' does not exist. Skipped ...")
         return
 
-    for instance in instance_list:
-        Logger.print_status(f"Removing instance {instance.service_file_path.stem} ...")
-        InstanceManager.remove(instance)
+    try:
+        shutil.rmtree(KLIPPER_DIR)
+    except OSError as e:
+        Logger.print_error(f"Unable to delete '{KLIPPER_DIR}':\n{e}")
+
+
+def remove_klipper_env() -> None:
+    if not KLIPPER_ENV_DIR.exists():
+        Logger.print_info(f"'{KLIPPER_ENV_DIR}' does not exist. Skipped ...")
+        return
+
+    try:
+        shutil.rmtree(KLIPPER_ENV_DIR)
+    except OSError as e:
+        Logger.print_error(f"Unable to delete '{KLIPPER_ENV_DIR}':\n{e}")
 
 
 def delete_klipper_logs(instances: List[Klipper]) -> None:
     all_logfiles = []
     for instance in instances:
-        all_logfiles = list(instance.base.log_dir.glob("klippy.log*"))
+        all_logfiles = list(instance.log_dir.glob("klippy.log*"))
     if not all_logfiles:
         Logger.print_info("No Klipper logs found. Skipped ...")
         return
 
     for log in all_logfiles:
         Logger.print_status(f"Remove '{log}'")
-        run_remove_routines(log)
+        remove_file(log)

kiauh/components/klipper/klipper_setup.py

@@ -6,44 +6,41 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 from pathlib import Path
-from typing import Dict, List, Tuple
 
 from components.klipper import (
     EXIT_KLIPPER_SETUP,
     KLIPPER_DIR,
     KLIPPER_ENV_DIR,
-    KLIPPER_INSTALL_SCRIPT,
-    KLIPPER_REQ_FILE,
+    KLIPPER_REQUIREMENTS_TXT,
 )
 from components.klipper.klipper import Klipper
-from components.klipper.klipper_dialogs import (
-    print_select_custom_name_dialog,
-)
 from components.klipper.klipper_utils import (
-    assign_custom_name,
+    add_to_existing,
     backup_klipper_dir,
+    check_is_single_to_multi_conversion,
     check_user_groups,
     create_example_printer_cfg,
     get_install_count,
     handle_disruptive_system_packages,
+    handle_instance_naming,
+    handle_to_multi_instance_conversion,
+    init_name_scheme,
+    update_name_scheme,
 )
 from components.moonraker.moonraker import Moonraker
 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.instance_utils import get_instances
+from utils.logger import DialogType, Logger
 from utils.sys_utils import (
     cmd_sysctl_manage,
-    cmd_sysctl_service,
     create_python_venv,
     install_python_requirements,
     parse_packages_from_file,
@@ -51,74 +48,57 @@ from utils.sys_utils import (
 
 
 def install_klipper() -> None:
-    Logger.print_status("Installing Klipper ...")
+    kl_im = InstanceManager(Klipper)
 
-    klipper_list: List[Klipper] = get_instances(Klipper)
-    moonraker_list: List[Moonraker] = get_instances(Moonraker)
-    match_moonraker: bool = False
-
-    # if there are more moonraker instances than klipper instances, ask the user to
-    # match the klipper instance count to the count of moonraker instances with the same suffix
-    if len(moonraker_list) > len(klipper_list):
-        is_confirmed = display_moonraker_info(moonraker_list)
-        if not is_confirmed:
-            Logger.print_status(EXIT_KLIPPER_SETUP)
-            return
-        match_moonraker = True
-
-    install_count, name_dict = get_install_count_and_name_dict(
-        klipper_list, moonraker_list
-    )
-
-    if install_count == 0:
+    # ask to add new instances, if there are existing ones
+    if kl_im.instances and not add_to_existing():
         Logger.print_status(EXIT_KLIPPER_SETUP)
         return
 
-    is_multi_install = install_count > 1 or (len(name_dict) >= 1 and install_count >= 1)
-    if not name_dict and install_count == 1:
-        name_dict = {0: ""}
-    elif is_multi_install and not match_moonraker:
-        custom_names = use_custom_names_or_go_back()
-        if custom_names is None:
-            Logger.print_status(EXIT_KLIPPER_SETUP)
-            return
+    install_count = get_install_count()
+    if install_count is None:
+        Logger.print_status(EXIT_KLIPPER_SETUP)
+        return
 
-        handle_instance_names(install_count, name_dict, custom_names)
+    # create a dict of the size of the existing instances + install count
+    name_dict = {c: "" for c in range(len(kl_im.instances) + install_count)}
+    name_scheme = init_name_scheme(kl_im.instances, install_count)
+    mr_im = InstanceManager(Moonraker)
+    name_scheme = update_name_scheme(
+        name_scheme, name_dict, kl_im.instances, mr_im.instances
+    )
+
+    handle_instance_naming(name_dict, name_scheme)
 
     create_example_cfg = get_confirm("Create example printer.cfg?")
-    # run the actual installation
+
     try:
-        run_klipper_setup(klipper_list, name_dict, create_example_cfg)
+        if not kl_im.instances:
+            check_install_dependencies(["git"])
+            setup_klipper_prerequesites()
+
+        count = 0
+        for name in name_dict:
+            if name_dict[name] in [n.suffix for n in kl_im.instances]:
+                continue
+
+            if check_is_single_to_multi_conversion(kl_im.instances):
+                handle_to_multi_instance_conversion(name_dict[name])
+                continue
+
+            count += 1
+            create_klipper_instance(name_dict[name], create_example_cfg)
+
+            if count == install_count:
+                break
+
+        cmd_sysctl_manage("daemon-reload")
+
     except Exception as e:
         Logger.print_error(e)
         Logger.print_error("Klipper installation failed!")
         return
 
-
-def run_klipper_setup(
-    klipper_list: List[Klipper], name_dict: Dict[int, str], create_example_cfg: bool
-) -> None:
-    if not klipper_list:
-        setup_klipper_prerequesites()
-
-    for i in name_dict:
-        # skip this iteration if there is already an instance with the name
-        if name_dict[i] in [n.suffix for n in klipper_list]:
-            continue
-
-        instance = Klipper(suffix=name_dict[i])
-        instance.create()
-        cmd_sysctl_service(instance.service_file_path.name, "enable")
-
-        if create_example_cfg:
-            # if a client-config is installed, include it in the new example cfg
-            clients = get_existing_clients()
-            create_example_printer_cfg(instance, clients)
-
-        cmd_sysctl_service(instance.service_file_path.name, "start")
-
-    cmd_sysctl_manage("daemon-reload")
-
     # step 4: check/handle conflicting packages/services
     handle_disruptive_system_packages()
 
@@ -126,35 +106,6 @@ def run_klipper_setup(
     check_user_groups()
 
 
-def handle_instance_names(
-    install_count: int, name_dict: Dict[int, str], custom_names: bool
-) -> None:
-    for i in range(install_count):  # 3
-        key: int = len(name_dict.keys()) + 1
-        if custom_names:
-            assign_custom_name(key, name_dict)
-        else:
-            name_dict[key] = str(len(name_dict) + 1)
-
-
-def get_install_count_and_name_dict(
-    klipper_list: List[Klipper], moonraker_list: List[Moonraker]
-) -> Tuple[int, Dict[int, str]]:
-    install_count: int | None
-    if len(moonraker_list) > len(klipper_list):
-        install_count = len(moonraker_list)
-        name_dict = {i: moonraker.suffix for i, moonraker in enumerate(moonraker_list)}
-    else:
-        install_count = get_install_count()
-        name_dict = {i: klipper.suffix for i, klipper in enumerate(klipper_list)}
-
-        if install_count is None:
-            Logger.print_status(EXIT_KLIPPER_SETUP)
-            return 0, {}
-
-    return install_count, name_dict
-
-
 def setup_klipper_prerequesites() -> None:
     settings = KiauhSettings()
     repo = settings.klipper.repo_url
@@ -164,23 +115,26 @@ def setup_klipper_prerequesites() -> None:
 
     # install klipper dependencies and create python virtualenv
     try:
-        install_klipper_packages()
-        if create_python_venv(KLIPPER_ENV_DIR):
-            install_python_requirements(KLIPPER_ENV_DIR, KLIPPER_REQ_FILE)
+        install_klipper_packages(KLIPPER_DIR)
+        create_python_venv(KLIPPER_ENV_DIR)
+        install_python_requirements(KLIPPER_ENV_DIR, KLIPPER_REQUIREMENTS_TXT)
     except Exception:
         Logger.print_error("Error during installation of Klipper requirements!")
         raise
 
 
-def install_klipper_packages() -> None:
-    script = KLIPPER_INSTALL_SCRIPT
+def install_klipper_packages(klipper_dir: Path) -> None:
+    script = klipper_dir.joinpath("scripts/install-debian.sh")
     packages = parse_packages_from_file(script)
-
+    packages = [pkg.replace("python-dev", "python3-dev") for pkg in packages]
+    packages.append("python3-venv")
+    # Add dfu-util for octopi-images
+    packages.append("dfu-util")
     # Add dbus requirement for DietPi distro
     if Path("/boot/dietpi/.version").exists():
         packages.append("dbus")
 
-    check_install_dependencies({*packages})
+    check_install_dependencies(packages)
 
 
 def update_klipper() -> None:
@@ -191,6 +145,7 @@ def update_klipper() -> None:
             "All Klipper instances will be restarted during the update process and "
             "ongoing prints WILL FAIL.",
         ],
+        end="",
     )
 
     if not get_confirm("Update Klipper now?"):
@@ -200,40 +155,27 @@ def update_klipper() -> None:
     if settings.kiauh.backup_before_update:
         backup_klipper_dir()
 
-    instances = get_instances(Klipper)
-    InstanceManager.stop_all(instances)
+    instance_manager = InstanceManager(Klipper)
+    instance_manager.stop_all_instance()
 
     git_pull_wrapper(repo=settings.klipper.repo_url, target_dir=KLIPPER_DIR)
 
     # install possible new system packages
-    install_klipper_packages()
+    install_klipper_packages(KLIPPER_DIR)
     # install possible new python dependencies
-    install_python_requirements(KLIPPER_ENV_DIR, KLIPPER_REQ_FILE)
+    install_python_requirements(KLIPPER_ENV_DIR, KLIPPER_REQUIREMENTS_TXT)
 
-    InstanceManager.start_all(instances)
+    instance_manager.start_all_instance()
 
 
-def use_custom_names_or_go_back() -> bool | None:
-    print_select_custom_name_dialog()
-    _input: bool | None = get_confirm(
-        "Assign custom names?",
-        False,
-        allow_go_back=True,
-    )
-    return _input
-
-
-def display_moonraker_info(moonraker_list: List[Moonraker]) -> bool:
-    # todo: only show the klipper instances that are not already installed
-    Logger.print_dialog(
-        DialogType.INFO,
-        [
-            "Existing Moonraker instances detected:",
-            *[f"● {m.service_file_path.stem}" for m in moonraker_list],
-            "\n\n",
-            "The following Klipper instances will be installed:",
-            *[f"● klipper-{m.suffix}" for m in moonraker_list],
-        ],
-    )
-    _input: bool = get_confirm("Proceed with installation?")
-    return _input
+def create_klipper_instance(name: str, create_example_cfg: bool) -> None:
+    kl_im = InstanceManager(Klipper)
+    new_instance = Klipper(suffix=name)
+    kl_im.current_instance = new_instance
+    kl_im.create_instance()
+    kl_im.enable_instance()
+    if create_example_cfg:
+        # if a client-config is installed, include it in the new example cfg
+        clients = get_existing_clients()
+        create_example_printer_cfg(new_instance, clients)
+    kl_im.start_instance()

kiauh/components/klipper/klipper_utils.py

@@ -6,13 +6,13 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import grp
 import os
+import re
 import shutil
 from subprocess import CalledProcessError, run
-from typing import Dict, List
+from typing import Dict, List, Optional, Union
 
 from components.klipper import (
     KLIPPER_BACKUP_DIR,
@@ -23,68 +23,185 @@ from components.klipper import (
 from components.klipper.klipper import Klipper
 from components.klipper.klipper_dialogs import (
     print_instance_overview,
+    print_select_custom_name_dialog,
     print_select_instance_count_dialog,
 )
+from components.moonraker.moonraker import Moonraker
+from components.moonraker.moonraker_utils import moonraker_to_multi_conversion
 from components.webui_client.base_data import BaseWebClient
 from components.webui_client.client_config.client_config_setup import (
     create_client_config_symlink,
 )
 from core.backup_manager.backup_manager import BackupManager
-from core.constants import CURRENT_USER
-from core.instance_manager.base_instance import SUFFIX_BLACKLIST
-from core.logger import DialogType, Logger
+from core.instance_manager.base_instance import BaseInstance
+from core.instance_manager.instance_manager import InstanceManager
+from core.instance_manager.name_scheme import NameScheme
 from core.submodules.simple_config_parser.src.simple_config_parser.simple_config_parser import (
     SimpleConfigParser,
 )
-from core.types import ComponentStatus
+from utils import PRINTER_CFG_BACKUP_DIR
 from utils.common import get_install_status
+from utils.constants import CURRENT_USER
 from utils.input_utils import get_confirm, get_number_input, get_string_input
-from utils.instance_utils import get_instances
+from utils.logger import DialogType, Logger
 from utils.sys_utils import cmd_sysctl_service
+from utils.types import ComponentStatus
 
 
 def get_klipper_status() -> ComponentStatus:
     return get_install_status(KLIPPER_DIR, KLIPPER_ENV_DIR, Klipper)
 
 
-def add_to_existing() -> bool | None:
-    kl_instances: List[Klipper] = get_instances(Klipper)
+def check_is_multi_install(
+    existing_instances: List[Klipper], install_count: int
+) -> bool:
+    return not existing_instances and install_count > 1
+
+
+def check_is_single_to_multi_conversion(
+    existing_instances: List[Klipper],
+) -> bool:
+    return len(existing_instances) == 1 and existing_instances[0].suffix == ""
+
+
+def init_name_scheme(
+    existing_instances: List[Klipper], install_count: int
+) -> NameScheme:
+    if check_is_multi_install(
+        existing_instances, install_count
+    ) or check_is_single_to_multi_conversion(existing_instances):
+        print_select_custom_name_dialog()
+        if get_confirm("Assign custom names?", False, allow_go_back=True):
+            return NameScheme.CUSTOM
+        else:
+            return NameScheme.INDEX
+    else:
+        return NameScheme.SINGLE
+
+
+def update_name_scheme(
+    name_scheme: NameScheme,
+    name_dict: Dict[int, str],
+    klipper_instances: List[Klipper],
+    moonraker_instances: List[Moonraker],
+) -> NameScheme:
+    # if there are more moonraker instances installed
+    # than klipper, we load their names into the name_dict,
+    # as we will detect and enforce that naming scheme
+    if len(moonraker_instances) > len(klipper_instances):
+        update_name_dict(name_dict, moonraker_instances)
+        return detect_name_scheme(moonraker_instances)
+    elif len(klipper_instances) > 1:
+        update_name_dict(name_dict, klipper_instances)
+        return detect_name_scheme(klipper_instances)
+    else:
+        return name_scheme
+
+
+def update_name_dict(name_dict: Dict[int, str], instances: List[BaseInstance]) -> None:
+    for k, v in enumerate(instances):
+        name_dict[k] = v.suffix
+
+
+def handle_instance_naming(name_dict: Dict[int, str], name_scheme: NameScheme) -> None:
+    if name_scheme == NameScheme.SINGLE:
+        return
+
+    for k in name_dict:
+        if name_dict[k] == "" and name_scheme == NameScheme.INDEX:
+            name_dict[k] = str(k + 1)
+        elif name_dict[k] == "" and name_scheme == NameScheme.CUSTOM:
+            assign_custom_name(k, name_dict)
+
+
+def add_to_existing() -> bool:
+    kl_instances = InstanceManager(Klipper).instances
     print_instance_overview(kl_instances)
-    _input: bool | None = get_confirm("Add new instances?", allow_go_back=True)
-    return _input
+    return get_confirm("Add new instances?", allow_go_back=True)
 
 
-def get_install_count() -> int | None:
+def get_install_count() -> Union[int, None]:
     """
     Print a dialog for selecting the amount of Klipper instances
     to set up with an option to navigate back. Returns None if the
     user selected to go back, otherwise an integer greater or equal than 1 |
     :return: Integer >= 1 or None
     """
-    kl_instances = get_instances(Klipper)
+    kl_instances = InstanceManager(Klipper).instances
     print_select_instance_count_dialog()
     question = (
         f"Number of"
         f"{' additional' if len(kl_instances) > 0 else ''} "
         f"Klipper instances to set up"
     )
-    _input: int | None = get_number_input(question, 1, default=1, allow_go_back=True)
-    return _input
+    return get_number_input(question, 1, default=1, allow_go_back=True)
 
 
 def assign_custom_name(key: int, name_dict: Dict[int, str]) -> None:
     existing_names = []
-    existing_names.extend(SUFFIX_BLACKLIST)
+    existing_names.extend(Klipper.blacklist())
     existing_names.extend(name_dict[n] for n in name_dict)
-    pattern = r"^[a-zA-Z0-9]+$"
-
-    question = f"Enter name for instance {key}"
-    name_dict[key] = get_string_input(question, exclude=existing_names, regex=pattern)
+    question = f"Enter name for instance {key + 1}"
+    name_dict[key] = get_string_input(question, exclude=existing_names)
 
 
-def check_user_groups() -> None:
+def handle_to_multi_instance_conversion(new_name: str) -> None:
+    Logger.print_status("Converting single instance to multi instances ...")
+    klipper_to_multi_conversion(new_name)
+    moonraker_to_multi_conversion(new_name)
+
+
+def klipper_to_multi_conversion(new_name: str) -> None:
+    Logger.print_status("Convert Klipper single to multi instance ...")
+    im = InstanceManager(Klipper)
+    im.current_instance = im.instances[0]
+
+    # temporarily store the data dir path
+    old_data_dir = im.instances[0].data_dir
+    old_data_dir_name = im.instances[0].data_dir_name
+
+    # backup the old data_dir
+    bm = BackupManager()
+    name = f"config-{old_data_dir_name}"
+    bm.backup_directory(
+        name,
+        source=im.current_instance.cfg_dir,
+        target=PRINTER_CFG_BACKUP_DIR,
+    )
+
+    # remove the old single instance
+    im.stop_instance()
+    im.disable_instance()
+    im.delete_instance()
+
+    # create a new klipper instance with the new name
+    new_instance = Klipper(suffix=new_name)
+    im.current_instance = new_instance
+
+    if not new_instance.data_dir.is_dir():
+        # rename the old data dir and use it for the new instance
+        Logger.print_status(f"Rename '{old_data_dir}' to '{new_instance.data_dir}' ...")
+        old_data_dir.rename(new_instance.data_dir)
+    else:
+        Logger.print_info(f"Existing '{new_instance.data_dir}' found ...")
+
+    # patch the virtual_sdcard sections path
+    # value to match the new printer_data foldername
+    scp = SimpleConfigParser()
+    scp.read(new_instance.cfg_file)
+    if scp.has_section("virtual_sdcard"):
+        scp.set("virtual_sdcard", "path", str(new_instance.gcodes_dir))
+        scp.write(new_instance.cfg_file)
+
+    # finalize creating the new instance
+    im.create_instance()
+    im.enable_instance()
+    im.start_instance()
+
+
+def check_user_groups():
     user_groups = [grp.getgrgid(gid).gr_name for gid in os.getgroups()]
-    missing_groups = [g for g in ["tty", "dialout"] if g not in user_groups]
+    missing_groups = [g for g in user_groups if g == "tty" or g == "dialout"]
 
     if not missing_groups:
         return
@@ -103,6 +220,7 @@ def check_user_groups() -> None:
             "INFO:",
             "Relog required for group assignments to take effect!",
         ],
+        end="",
     )
 
     if not get_confirm(f"Add user '{CURRENT_USER}' to group(s) now?"):
@@ -154,13 +272,27 @@ def handle_disruptive_system_packages() -> None:
                     "Please fix the problem manually. Otherwise, this may have "
                     "undesirable effects on the operation of Klipper."
                 ],
+                end="",
             )
 
 
+def detect_name_scheme(instance_list: List[BaseInstance]) -> NameScheme:
+    pattern = re.compile("^\d+$")
+    for instance in instance_list:
+        if not pattern.match(instance.suffix):
+            return NameScheme.CUSTOM
+
+    return NameScheme.INDEX
+
+
+def get_highest_index(instance_list: List[Klipper]) -> int:
+    return max([int(instance.suffix.split("-")[-1]) for instance in instance_list])
+
+
 def create_example_printer_cfg(
-    instance: Klipper, clients: List[BaseWebClient] | None = None
+    instance: Klipper, clients: Optional[List[BaseWebClient]] = None
 ) -> None:
-    Logger.print_status(f"Creating example printer.cfg in '{instance.base.cfg_dir}'")
+    Logger.print_status(f"Creating example printer.cfg in '{instance.cfg_dir}'")
     if instance.cfg_file.is_file():
         Logger.print_info(f"'{instance.cfg_file}' already exists.")
         return
@@ -175,7 +307,7 @@ def create_example_printer_cfg(
 
     scp = SimpleConfigParser()
     scp.read(target)
-    scp.set("virtual_sdcard", "path", str(instance.base.gcodes_dir))
+    scp.set("virtual_sdcard", "path", str(instance.gcodes_dir))
 
     # include existing client configs in the example config
     if clients is not None and len(clients) > 0:
@@ -187,7 +319,7 @@ def create_example_printer_cfg(
 
     scp.write(target)
 
-    Logger.print_ok(f"Example printer.cfg created in '{instance.base.cfg_dir}'")
+    Logger.print_ok(f"Example printer.cfg created in '{instance.cfg_dir}'")
 
 
 def backup_klipper_dir() -> None:

kiauh/components/klipper/menus/klipper_remove_menu.py

@@ -6,40 +6,42 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import textwrap
-from typing import Type
+from typing import Optional, Type
 
 from components.klipper import klipper_remove
-from core.constants import COLOR_CYAN, COLOR_RED, RESET_FORMAT
 from core.menus import FooterType, Option
 from core.menus.base_menu import BaseMenu
+from utils.constants import COLOR_CYAN, COLOR_RED, RESET_FORMAT
 
 
 # noinspection PyUnusedLocal
 class KlipperRemoveMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None):
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
-        self.footer_type = FooterType.BACK
+        self.previous_menu = previous_menu
+        self.footer_type = FooterType.BACK_HELP
         self.remove_klipper_service = False
         self.remove_klipper_dir = False
         self.remove_klipper_env = False
-        self.selection_state = False
+        self.delete_klipper_logs = False
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         from core.menus.remove_menu import RemoveMenu
 
-        self.previous_menu = previous_menu if previous_menu is not None else RemoveMenu
+        self.previous_menu: Type[BaseMenu] = (
+            previous_menu if previous_menu is not None else RemoveMenu
+        )
 
     def set_options(self) -> None:
         self.options = {
-            "a": Option(method=self.toggle_all),
-            "1": Option(method=self.toggle_remove_klipper_service),
-            "2": Option(method=self.toggle_remove_klipper_dir),
-            "3": Option(method=self.toggle_remove_klipper_env),
-            "c": Option(method=self.run_removal_process),
+            "0": Option(method=self.toggle_all, menu=False),
+            "1": Option(method=self.toggle_remove_klipper_service, menu=False),
+            "2": Option(method=self.toggle_remove_klipper_dir, menu=False),
+            "3": Option(method=self.toggle_remove_klipper_env, menu=False),
+            "4": Option(method=self.toggle_delete_klipper_logs, menu=False),
+            "c": Option(method=self.run_removal_process, menu=False),
         }
 
     def print_menu(self) -> None:
@@ -51,6 +53,7 @@ class KlipperRemoveMenu(BaseMenu):
         o1 = checked if self.remove_klipper_service else unchecked
         o2 = checked if self.remove_klipper_dir else unchecked
         o3 = checked if self.remove_klipper_env else unchecked
+        o4 = checked if self.delete_klipper_logs else unchecked
         menu = textwrap.dedent(
             f"""
             ╔═══════════════════════════════════════════════════════╗
@@ -59,11 +62,12 @@ class KlipperRemoveMenu(BaseMenu):
             ║ Enter a number and hit enter to select / deselect     ║
             ║ the specific option for removal.                      ║
             ╟───────────────────────────────────────────────────────╢
-            ║  a) {self._get_selection_state_str():37}             ║
+            ║  0) Select everything                                 ║
             ╟───────────────────────────────────────────────────────╢
             ║  1) {o1} Remove Service                                ║
             ║  2) {o2} Remove Local Repository                       ║
             ║  3) {o3} Remove Python Environment                     ║
+            ║  4) {o4} Delete all Log-Files                          ║
             ╟───────────────────────────────────────────────────────╢
             ║  C) Continue                                          ║
             ╟───────────────────────────────────────────────────────╢
@@ -72,10 +76,10 @@ class KlipperRemoveMenu(BaseMenu):
         print(menu, end="")
 
     def toggle_all(self, **kwargs) -> None:
-        self.selection_state = not self.selection_state
-        self.remove_klipper_service = self.selection_state
-        self.remove_klipper_dir = self.selection_state
-        self.remove_klipper_env = self.selection_state
+        self.remove_klipper_service = True
+        self.remove_klipper_dir = True
+        self.remove_klipper_env = True
+        self.delete_klipper_logs = True
 
     def toggle_remove_klipper_service(self, **kwargs) -> None:
         self.remove_klipper_service = not self.remove_klipper_service
@@ -86,11 +90,15 @@ class KlipperRemoveMenu(BaseMenu):
     def toggle_remove_klipper_env(self, **kwargs) -> None:
         self.remove_klipper_env = not self.remove_klipper_env
 
+    def toggle_delete_klipper_logs(self, **kwargs) -> None:
+        self.delete_klipper_logs = not self.delete_klipper_logs
+
     def run_removal_process(self, **kwargs) -> None:
         if (
             not self.remove_klipper_service
             and not self.remove_klipper_dir
             and not self.remove_klipper_env
+            and not self.delete_klipper_logs
         ):
             error = f"{COLOR_RED}Nothing selected! Select options to remove first.{RESET_FORMAT}"
             print(error)
@@ -100,19 +108,10 @@ class KlipperRemoveMenu(BaseMenu):
             self.remove_klipper_service,
             self.remove_klipper_dir,
             self.remove_klipper_env,
+            self.delete_klipper_logs,
         )
 
         self.remove_klipper_service = False
         self.remove_klipper_dir = False
         self.remove_klipper_env = False
-
-        self._go_back()
-
-    def _get_selection_state_str(self) -> str:
-        return (
-            "Select everything" if not self.selection_state else "Deselect everything"
-        )
-
-    def _go_back(self, **kwargs) -> None:
-        if self.previous_menu is not None:
-            self.previous_menu().run()
+        self.delete_klipper_logs = False

kiauh/components/klipper_firmware/firmware_utils.py

@@ -18,19 +18,18 @@ from components.klipper_firmware.flash_options import (
     FlashOptions,
 )
 from core.instance_manager.instance_manager import InstanceManager
-from core.logger import Logger
-from utils.instance_utils import get_instances
+from utils.logger import Logger
 from utils.sys_utils import log_process
 
 
 def find_firmware_file() -> bool:
     target = KLIPPER_DIR.joinpath("out")
-    target_exists: bool = target.exists()
+    target_exists = target.exists()
 
     f1 = "klipper.elf.hex"
     f2 = "klipper.elf"
     f3 = "klipper.bin"
-    fw_file_exists: bool = (
+    fw_file_exists = (
         target.joinpath(f1).exists() and target.joinpath(f2).exists()
     ) or target.joinpath(f3).exists()
 
@@ -76,11 +75,10 @@ def get_sd_flash_board_list() -> List[str]:
 
     try:
         cmd = f"{SD_FLASH_SCRIPT} -l"
-        blist: List[str] = check_output(cmd, shell=True, text=True).splitlines()[1:]
-        return blist
+        blist = check_output(cmd, shell=True, text=True)
+        return blist.splitlines()[1:]
     except CalledProcessError as e:
         Logger.print_error(f"An unexpected error occured:\n{e}")
-        return []
 
 
 def start_flash_process(flash_options: FlashOptions) -> None:
@@ -118,13 +116,13 @@ def start_flash_process(flash_options: FlashOptions) -> None:
         else:
             raise Exception("Invalid value for flash_method!")
 
-        instances = get_instances(Klipper)
-        InstanceManager.stop_all(instances)
+        instance_manager = InstanceManager(Klipper)
+        instance_manager.stop_all_instance()
 
         process = Popen(cmd, cwd=KLIPPER_DIR, stdout=PIPE, stderr=STDOUT, text=True)
         log_process(process)
 
-        InstanceManager.start_all(instances)
+        instance_manager.start_all_instance()
 
         rc = process.returncode
         if rc != 0:

kiauh/components/klipper_firmware/flash_options.py

@@ -6,11 +6,10 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 from dataclasses import field
 from enum import Enum
-from typing import List
+from typing import List, Union
 
 
 class FlashMethod(Enum):
@@ -31,9 +30,9 @@ class ConnectionType(Enum):
 
 class FlashOptions:
     _instance = None
-    _flash_method: FlashMethod | None = None
-    _flash_command: FlashCommand | None = None
-    _connection_type: ConnectionType | None = None
+    _flash_method: Union[FlashMethod, None] = None
+    _flash_command: Union[FlashCommand, None] = None
+    _connection_type: Union[ConnectionType, None] = None
     _mcu_list: List[str] = field(default_factory=list)
     _selected_mcu: str = ""
     _selected_board: str = ""
@@ -45,31 +44,31 @@ class FlashOptions:
         return cls._instance
 
     @classmethod
-    def destroy(cls) -> None:
+    def destroy(cls):
         cls._instance = None
 
     @property
-    def flash_method(self) -> FlashMethod | None:
+    def flash_method(self) -> Union[FlashMethod, None]:
         return self._flash_method
 
     @flash_method.setter
-    def flash_method(self, value: FlashMethod | None):
+    def flash_method(self, value: Union[FlashMethod, None]):
         self._flash_method = value
 
     @property
-    def flash_command(self) -> FlashCommand | None:
+    def flash_command(self) -> Union[FlashCommand, None]:
         return self._flash_command
 
     @flash_command.setter
-    def flash_command(self, value: FlashCommand | None):
+    def flash_command(self, value: Union[FlashCommand, None]):
         self._flash_command = value
 
     @property
-    def connection_type(self) -> ConnectionType | None:
+    def connection_type(self) -> Union[ConnectionType, None]:
         return self._connection_type
 
     @connection_type.setter
-    def connection_type(self, value: ConnectionType | None):
+    def connection_type(self, value: Union[ConnectionType, None]):
         self._connection_type = value
 
     @property

kiauh/components/klipper_firmware/menus/klipper_build_menu.py

@@ -6,10 +6,9 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import textwrap
-from typing import List, Set, Type
+from typing import Optional, Type
 
 from components.klipper import KLIPPER_DIR
 from components.klipper_firmware.firmware_utils import (
@@ -17,10 +16,10 @@ from components.klipper_firmware.firmware_utils import (
     run_make_clean,
     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.constants import COLOR_CYAN, COLOR_GREEN, COLOR_RED, RESET_FORMAT
+from utils.logger import Logger
 from utils.sys_utils import (
     check_package_install,
     install_system_packages,
@@ -31,26 +30,26 @@ from utils.sys_utils import (
 # noinspection PyUnusedLocal
 # noinspection PyMethodMayBeStatic
 class KlipperBuildFirmwareMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None):
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
-        self.deps: Set[str] = {"build-essential", "dpkg-dev", "make"}
-        self.missing_deps: List[str] = check_package_install(self.deps)
+        self.previous_menu = previous_menu
+        self.deps = ["build-essential", "dpkg-dev", "make"]
+        self.missing_deps = check_package_install(self.deps)
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         from core.menus.advanced_menu import AdvancedMenu
 
-        self.previous_menu = (
+        self.previous_menu: Type[BaseMenu] = (
             previous_menu if previous_menu is not None else AdvancedMenu
         )
 
     def set_options(self) -> None:
         if len(self.missing_deps) == 0:
             self.input_label_txt = "Press ENTER to continue"
-            self.default_option = Option(method=self.start_build_process)
+            self.default_option = Option(method=self.start_build_process, menu=False)
         else:
             self.input_label_txt = "Press ENTER to install dependencies"
-            self.default_option = Option(method=self.install_missing_deps)
+            self.default_option = Option(method=self.install_missing_deps, menu=False)
 
     def print_menu(self) -> None:
         header = " [ Build Firmware Menu ] "
@@ -81,7 +80,6 @@ class KlipperBuildFirmwareMenu(BaseMenu):
             line = f"{COLOR_RED}Dependencies are missing!{RESET_FORMAT}"
 
         menu += f"║ {line:<62} ║\n"
-        menu += "╟───────────────────────────────────────────────────────╢\n"
 
         print(menu, end="")
 
@@ -111,5 +109,4 @@ class KlipperBuildFirmwareMenu(BaseMenu):
             Logger.print_error("Building Klipper Firmware failed!")
 
         finally:
-            if self.previous_menu is not None:
-                self.previous_menu().run()
+            self.previous_menu().run()

kiauh/components/klipper_firmware/menus/klipper_flash_error_menu.py

@@ -6,33 +6,31 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
-
 import textwrap
-from typing import Type
+from typing import Optional, Type
 
 from components.klipper_firmware.flash_options import FlashMethod, FlashOptions
-from core.constants import COLOR_RED, RESET_FORMAT
 from core.menus import FooterType, Option
 from core.menus.base_menu import BaseMenu
+from utils.constants import COLOR_RED, RESET_FORMAT
 
 
 # noinspection PyUnusedLocal
 # noinspection PyMethodMayBeStatic
 class KlipperNoFirmwareErrorMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None):
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
+        self.previous_menu = previous_menu
 
         self.flash_options = FlashOptions()
         self.footer_type = FooterType.BLANK
         self.input_label_txt = "Press ENTER to go back to [Advanced Menu]"
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         self.previous_menu = previous_menu
 
     def set_options(self) -> None:
-        self.default_option = Option(method=self.go_back)
+        self.default_option = Option(self.go_back, False)
 
     def print_menu(self) -> None:
         header = "!!! NO FIRMWARE FILE FOUND !!!"
@@ -69,17 +67,17 @@ class KlipperNoFirmwareErrorMenu(BaseMenu):
 # noinspection PyUnusedLocal
 # noinspection PyMethodMayBeStatic
 class KlipperNoBoardTypesErrorMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None):
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
+        self.previous_menu = previous_menu
         self.footer_type = FooterType.BLANK
         self.input_label_txt = "Press ENTER to go back to [Main Menu]"
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         self.previous_menu = previous_menu
 
     def set_options(self) -> None:
-        self.default_option = Option(method=self.go_back)
+        self.default_option = Option(self.go_back, False)
 
     def print_menu(self) -> None:
         header = "!!! ERROR GETTING BOARD LIST !!!"

kiauh/components/klipper_firmware/menus/klipper_flash_help_menu.py

@@ -6,27 +6,25 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
-
 import textwrap
-from typing import Type
+from typing import Optional, Type
 
-from core.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 from core.menus.base_menu import BaseMenu
+from utils.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 
 
 # noinspection DuplicatedCode
 class KlipperFlashMethodHelpMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None):
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
+        self.previous_menu = previous_menu
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         from components.klipper_firmware.menus.klipper_flash_menu import (
             KlipperFlashMethodMenu,
         )
 
-        self.previous_menu = (
+        self.previous_menu: Type[BaseMenu] = (
             previous_menu if previous_menu is not None else KlipperFlashMethodMenu
         )
 
@@ -75,16 +73,16 @@ class KlipperFlashMethodHelpMenu(BaseMenu):
 
 # noinspection DuplicatedCode
 class KlipperFlashCommandHelpMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None):
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
+        self.previous_menu = previous_menu
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         from components.klipper_firmware.menus.klipper_flash_menu import (
             KlipperFlashCommandMenu,
         )
 
-        self.previous_menu = (
+        self.previous_menu: Type[BaseMenu] = (
             previous_menu if previous_menu is not None else KlipperFlashCommandMenu
         )
 
@@ -119,16 +117,16 @@ class KlipperFlashCommandHelpMenu(BaseMenu):
 
 # noinspection DuplicatedCode
 class KlipperMcuConnectionHelpMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None):
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
+        self.previous_menu = previous_menu
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         from components.klipper_firmware.menus.klipper_flash_menu import (
             KlipperSelectMcuConnectionMenu,
         )
 
-        self.previous_menu = (
+        self.previous_menu: Type[BaseMenu] = (
             previous_menu
             if previous_menu is not None
             else KlipperSelectMcuConnectionMenu

kiauh/components/klipper_firmware/menus/klipper_flash_menu.py

@@ -6,11 +6,10 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import textwrap
 import time
-from typing import Type
+from typing import Optional, Type
 
 from components.klipper_firmware.firmware_utils import (
     find_firmware_file,
@@ -35,34 +34,34 @@ from components.klipper_firmware.menus.klipper_flash_help_menu import (
     KlipperFlashMethodHelpMenu,
     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.constants import COLOR_CYAN, COLOR_RED, COLOR_YELLOW, RESET_FORMAT
 from utils.input_utils import get_number_input
+from utils.logger import DialogType, Logger
 
 
 # noinspection PyUnusedLocal
 # noinspection PyMethodMayBeStatic
 class KlipperFlashMethodMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None):
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
         self.help_menu = KlipperFlashMethodHelpMenu
         self.input_label_txt = "Select flash method"
         self.footer_type = FooterType.BACK_HELP
         self.flash_options = FlashOptions()
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         from core.menus.advanced_menu import AdvancedMenu
 
-        self.previous_menu = (
+        self.previous_menu: Type[BaseMenu] = (
             previous_menu if previous_menu is not None else AdvancedMenu
         )
 
     def set_options(self) -> None:
         self.options = {
-            "1": Option(self.select_regular),
-            "2": Option(self.select_sdcard),
+            "1": Option(self.select_regular, menu=False),
+            "2": Option(self.select_sdcard, menu=False),
         }
 
     def print_menu(self) -> None:
@@ -109,24 +108,24 @@ class KlipperFlashMethodMenu(BaseMenu):
 # noinspection PyUnusedLocal
 # noinspection PyMethodMayBeStatic
 class KlipperFlashCommandMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None):
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
         self.help_menu = KlipperFlashCommandHelpMenu
         self.input_label_txt = "Select flash command"
         self.footer_type = FooterType.BACK_HELP
         self.flash_options = FlashOptions()
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
-        self.previous_menu = (
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
+        self.previous_menu: Type[BaseMenu] = (
             previous_menu if previous_menu is not None else KlipperFlashMethodMenu
         )
 
     def set_options(self) -> None:
         self.options = {
-            "1": Option(self.select_flash),
-            "2": Option(self.select_serialflash),
+            "1": Option(self.select_flash, menu=False),
+            "2": Option(self.select_serialflash, menu=False),
         }
-        self.default_option = Option(self.select_flash)
+        self.default_option = Option(self.select_flash, menu=False)
 
     def print_menu(self) -> None:
         menu = textwrap.dedent(
@@ -157,26 +156,26 @@ class KlipperFlashCommandMenu(BaseMenu):
 # noinspection PyMethodMayBeStatic
 class KlipperSelectMcuConnectionMenu(BaseMenu):
     def __init__(
-        self, previous_menu: Type[BaseMenu] | None = None, standalone: bool = False
+        self, previous_menu: Optional[Type[BaseMenu]] = None, standalone: bool = False
     ):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
+        self.previous_menu = previous_menu
         self.__standalone = standalone
         self.help_menu = KlipperMcuConnectionHelpMenu
         self.input_label_txt = "Select connection type"
         self.footer_type = FooterType.BACK_HELP
         self.flash_options = FlashOptions()
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
-        self.previous_menu = (
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
+        self.previous_menu: Type[BaseMenu] = (
             previous_menu if previous_menu is not None else KlipperFlashCommandMenu
         )
 
     def set_options(self) -> None:
         self.options = {
-            "1": Option(method=self.select_usb),
-            "2": Option(method=self.select_dfu),
-            "3": Option(method=self.select_usb_dfu),
+            "1": Option(method=self.select_usb, menu=False),
+            "2": Option(method=self.select_dfu, menu=False),
+            "3": Option(method=self.select_usb_dfu, menu=False),
         }
 
     def print_menu(self) -> None:
@@ -244,15 +243,15 @@ class KlipperSelectMcuConnectionMenu(BaseMenu):
 # noinspection PyUnusedLocal
 # noinspection PyMethodMayBeStatic
 class KlipperSelectMcuIdMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None):
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
         self.flash_options = FlashOptions()
         self.mcu_list = self.flash_options.mcu_list
         self.input_label_txt = "Select MCU to flash"
-        self.footer_type = FooterType.BACK
+        self.footer_type = FooterType.BACK_HELP
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
-        self.previous_menu = (
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
+        self.previous_menu: Type[BaseMenu] = (
             previous_menu
             if previous_menu is not None
             else KlipperSelectMcuConnectionMenu
@@ -260,12 +259,13 @@ class KlipperSelectMcuIdMenu(BaseMenu):
 
     def set_options(self) -> None:
         self.options = {
-            f"{i}": Option(self.flash_mcu, f"{i}") for i in range(len(self.mcu_list))
+            f"{i}": Option(self.flash_mcu, False, f"{i}")
+            for i in range(len(self.mcu_list))
         }
 
     def print_menu(self) -> None:
         header = "!!! ATTENTION !!!"
-        header2 = f"[{COLOR_CYAN}List of detected MCUs{RESET_FORMAT}]"
+        header2 = f"[{COLOR_CYAN}List of available MCUs{RESET_FORMAT}]"
         color = COLOR_RED
         count = 62 - len(color) - len(RESET_FORMAT)
         menu = textwrap.dedent(
@@ -277,58 +277,44 @@ class KlipperSelectMcuIdMenu(BaseMenu):
             ║ ONLY flash a firmware created for the respective MCU! ║
             ║                                                       ║
             ╟{header2:─^64}╢
-            ║                                                       ║
             """
         )[1:]
 
         for i, mcu in enumerate(self.mcu_list):
             mcu = mcu.split("/")[-1]
-            menu += f"║ {i}) {COLOR_CYAN}{mcu:<51}{RESET_FORMAT}║\n"
+            menu += f"   ● MCU #{i}: {COLOR_CYAN}{mcu}{RESET_FORMAT}\n"
+        menu += "╟───────────────────────────┬───────────────────────────╢"
 
-        menu += textwrap.dedent(
-            """
-            ║                                                       ║
-            ╟───────────────────────────────────────────────────────╢
-            """
-        )[1:]
-        print(menu, end="")
+        print(menu, end="\n")
 
     def flash_mcu(self, **kwargs):
-        try:
-            index: int | None = kwargs.get("opt_index", None)
-            if index is None:
-                raise Exception("opt_index is None")
+        index = int(kwargs.get("opt_index"))
+        selected_mcu = self.mcu_list[index]
+        self.flash_options.selected_mcu = selected_mcu
 
-            index = int(index)
-            selected_mcu = self.mcu_list[index]
-            self.flash_options.selected_mcu = selected_mcu
-
-            if self.flash_options.flash_method == FlashMethod.SD_CARD:
-                KlipperSelectSDFlashBoardMenu(previous_menu=self.__class__).run()
-            elif self.flash_options.flash_method == FlashMethod.REGULAR:
-                KlipperFlashOverviewMenu(previous_menu=self.__class__).run()
-        except Exception as e:
-            Logger.print_error(e)
-            Logger.print_error("Flashing failed!")
+        if self.flash_options.flash_method == FlashMethod.SD_CARD:
+            KlipperSelectSDFlashBoardMenu(previous_menu=self.__class__).run()
+        elif self.flash_options.flash_method == FlashMethod.REGULAR:
+            KlipperFlashOverviewMenu(previous_menu=self.__class__).run()
 
 
 # noinspection PyUnusedLocal
 # noinspection PyMethodMayBeStatic
 class KlipperSelectSDFlashBoardMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None):
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
         self.flash_options = FlashOptions()
         self.available_boards = get_sd_flash_board_list()
         self.input_label_txt = "Select board type"
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
-        self.previous_menu = (
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
+        self.previous_menu: Type[BaseMenu] = (
             previous_menu if previous_menu is not None else KlipperSelectMcuIdMenu
         )
 
     def set_options(self) -> None:
         self.options = {
-            f"{i}": Option(self.board_select, f"{i}")
+            f"{i}": Option(self.board_select, False, f"{i}")
             for i in range(len(self.available_boards))
         }
 
@@ -349,22 +335,14 @@ class KlipperSelectSDFlashBoardMenu(BaseMenu):
 
             for i, board in enumerate(self.available_boards):
                 line = f" {i}) {board}"
-                menu += f"║{line:<55}║\n"
-            menu += "╟───────────────────────────────────────────────────────╢"
+                menu += f"|{line:<55}|\n"
+
             print(menu, end="")
 
     def board_select(self, **kwargs):
-        try:
-            index: int | None = kwargs.get("opt_index", None)
-            if index is None:
-                raise Exception("opt_index is None")
-
-            index = int(index)
-            self.flash_options.selected_board = self.available_boards[index]
-            self.baudrate_select()
-        except Exception as e:
-            Logger.print_error(e)
-            Logger.print_error("Board selection failed!")
+        board = int(kwargs.get("opt_index"))
+        self.flash_options.selected_board = self.available_boards[board]
+        self.baudrate_select()
 
     def baudrate_select(self, **kwargs):
         Logger.print_dialog(
@@ -375,6 +353,7 @@ class KlipperSelectSDFlashBoardMenu(BaseMenu):
                 "\n\n",
                 "If you are unsure, stick to the default 250000!",
             ],
+            end="",
         )
         self.flash_options.selected_baudrate = get_number_input(
             question="Please set the baud rate",
@@ -388,21 +367,21 @@ class KlipperSelectSDFlashBoardMenu(BaseMenu):
 # noinspection PyUnusedLocal
 # noinspection PyMethodMayBeStatic
 class KlipperFlashOverviewMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None):
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
         self.flash_options = FlashOptions()
         self.input_label_txt = "Perform action (default=Y)"
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
+        self.previous_menu: Type[BaseMenu] = previous_menu
 
     def set_options(self) -> None:
         self.options = {
-            "y": Option(self.execute_flash),
-            "n": Option(self.abort_process),
+            "Y": Option(self.execute_flash, menu=False),
+            "N": Option(self.abort_process, menu=False),
         }
 
-        self.default_option = Option(self.execute_flash)
+        self.default_option = Option(self.execute_flash, menu=False)
 
     def print_menu(self) -> None:
         header = "!!! ATTENTION !!!"
@@ -412,7 +391,7 @@ class KlipperFlashOverviewMenu(BaseMenu):
         method = self.flash_options.flash_method.value
         command = self.flash_options.flash_command.value
         conn_type = self.flash_options.connection_type.value
-        mcu = self.flash_options.selected_mcu.split("/")[-1]
+        mcu = self.flash_options.selected_mcu
         board = self.flash_options.selected_board
         baudrate = self.flash_options.selected_baudrate
         subheader = f"[{COLOR_CYAN}Overview{RESET_FORMAT}]"
@@ -426,37 +405,26 @@ class KlipperFlashOverviewMenu(BaseMenu):
             ║ sure everything is correct, start the process. If any ║
             ║ parameter needs to be changed, you can go back (B)    ║
             ║ step by step or abort and start from the beginning.   ║
-            ║{subheader:─^64}║
-            ║                                                       ║
+            ║{subheader:-^64}║
             """
         )[1:]
 
-        menu += textwrap.dedent(
-            f"""
-            ║ MCU: {COLOR_CYAN}{mcu:<48}{RESET_FORMAT} ║
-            ║ Connection: {COLOR_CYAN}{conn_type:<41}{RESET_FORMAT} ║
-            ║ Flash method: {COLOR_CYAN}{method:<39}{RESET_FORMAT} ║
-            ║ Flash command: {COLOR_CYAN}{command:<38}{RESET_FORMAT} ║
-            """
-        )[1:]
+        menu += f"   ● MCU: {COLOR_CYAN}{mcu}{RESET_FORMAT}\n"
+        menu += f"   ● Connection: {COLOR_CYAN}{conn_type}{RESET_FORMAT}\n"
+        menu += f"   ● Flash method: {COLOR_CYAN}{method}{RESET_FORMAT}\n"
+        menu += f"   ● Flash command: {COLOR_CYAN}{command}{RESET_FORMAT}\n"
 
         if self.flash_options.flash_method is FlashMethod.SD_CARD:
-            menu += textwrap.dedent(
-                f"""
-                ║ Board type: {COLOR_CYAN}{board:<41}{RESET_FORMAT} ║
-                ║ Baudrate: {COLOR_CYAN}{baudrate:<43}{RESET_FORMAT} ║
-                """
-            )[1:]
+            menu += f"   ● Board type: {COLOR_CYAN}{board}{RESET_FORMAT}\n"
+            menu += f"   ● Baudrate: {COLOR_CYAN}{baudrate}{RESET_FORMAT}\n"
 
         menu += textwrap.dedent(
             """
-            ║                                                       ║
             ╟───────────────────────────────────────────────────────╢
             ║  Y) Start flash process                               ║
             ║  N) Abort - Return to Advanced Menu                   ║
-            ╟───────────────────────────────────────────────────────╢
             """
-        )[1:]
+        )
         print(menu, end="")
 
     def execute_flash(self, **kwargs):

kiauh/components/klipperscreen/__init__.py

@@ -9,26 +9,8 @@
 from pathlib import Path
 
 from core.backup_manager import BACKUP_ROOT_DIR
-from core.constants import SYSTEMD
 
-# repo
 KLIPPERSCREEN_REPO = "https://github.com/KlipperScreen/KlipperScreen.git"
-
-# names
-KLIPPERSCREEN_SERVICE_NAME = "KlipperScreen.service"
-KLIPPERSCREEN_UPDATER_SECTION_NAME = "update_manager KlipperScreen"
-KLIPPERSCREEN_LOG_NAME = "KlipperScreen.log"
-
-# directories
 KLIPPERSCREEN_DIR = Path.home().joinpath("KlipperScreen")
-KLIPPERSCREEN_ENV_DIR = Path.home().joinpath(".KlipperScreen-env")
+KLIPPERSCREEN_ENV = Path.home().joinpath(".KlipperScreen-env")
 KLIPPERSCREEN_BACKUP_DIR = BACKUP_ROOT_DIR.joinpath("klipperscreen-backups")
-
-# files
-KLIPPERSCREEN_REQ_FILE = KLIPPERSCREEN_DIR.joinpath(
-    "scripts/KlipperScreen-requirements.txt"
-)
-KLIPPERSCREEN_INSTALL_SCRIPT = KLIPPERSCREEN_DIR.joinpath(
-    "scripts/KlipperScreen-install.sh"
-)
-KLIPPERSCREEN_SERVICE_FILE = SYSTEMD.joinpath(KLIPPERSCREEN_SERVICE_NAME)

kiauh/components/klipperscreen/klipperscreen.py

@@ -15,40 +15,33 @@ from components.klipper.klipper import Klipper
 from components.klipperscreen import (
     KLIPPERSCREEN_BACKUP_DIR,
     KLIPPERSCREEN_DIR,
-    KLIPPERSCREEN_ENV_DIR,
-    KLIPPERSCREEN_INSTALL_SCRIPT,
-    KLIPPERSCREEN_LOG_NAME,
+    KLIPPERSCREEN_ENV,
     KLIPPERSCREEN_REPO,
-    KLIPPERSCREEN_REQ_FILE,
-    KLIPPERSCREEN_SERVICE_FILE,
-    KLIPPERSCREEN_SERVICE_NAME,
-    KLIPPERSCREEN_UPDATER_SECTION_NAME,
 )
 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 core.types import ComponentStatus
 from utils.common import (
     check_install_dependencies,
     get_install_status,
 )
 from utils.config_utils import add_config_section, remove_config_section
+from utils.constants import SYSTEMD
 from utils.fs_utils import remove_with_sudo
 from utils.git_utils import (
     git_clone_wrapper,
     git_pull_wrapper,
 )
 from utils.input_utils import get_confirm
-from utils.instance_utils import get_instances
+from utils.logger import DialogType, Logger
 from utils.sys_utils import (
     check_python_version,
+    cmd_sysctl_manage,
     cmd_sysctl_service,
     install_python_requirements,
-    remove_system_service,
 )
+from utils.types import ComponentStatus
 
 
 def install_klipperscreen() -> None:
@@ -57,7 +50,8 @@ def install_klipperscreen() -> None:
     if not check_python_version(3, 7):
         return
 
-    mr_instances = get_instances(Moonraker)
+    mr_im = InstanceManager(Moonraker)
+    mr_instances = mr_im.instances
     if not mr_instances:
         Logger.print_dialog(
             DialogType.WARNING,
@@ -68,6 +62,7 @@ def install_klipperscreen() -> None:
                 "KlipperScreens update manager configuration for Moonraker "
                 "will not be added to any moonraker.conf.",
             ],
+            end="",
         )
         if not get_confirm(
             "Continue KlipperScreen installation?",
@@ -76,15 +71,17 @@ def install_klipperscreen() -> None:
         ):
             return
 
-    check_install_dependencies()
+    package_list = ["git", "wget", "curl", "unzip", "dfu-util"]
+    check_install_dependencies(package_list)
 
     git_clone_wrapper(KLIPPERSCREEN_REPO, KLIPPERSCREEN_DIR)
 
     try:
-        run(KLIPPERSCREEN_INSTALL_SCRIPT.as_posix(), shell=True, check=True)
+        script = f"{KLIPPERSCREEN_DIR}/scripts/KlipperScreen-install.sh"
+        run(script, shell=True, check=True)
         if mr_instances:
             patch_klipperscreen_update_manager(mr_instances)
-            InstanceManager.restart_all(mr_instances)
+            mr_im.restart_all_instance()
         else:
             Logger.print_info(
                 "Moonraker is not installed! Cannot add "
@@ -97,30 +94,34 @@ def install_klipperscreen() -> None:
 
 
 def patch_klipperscreen_update_manager(instances: List[Moonraker]) -> None:
+    env_py = f"{KLIPPERSCREEN_ENV}/bin/python"
     add_config_section(
-        section=KLIPPERSCREEN_UPDATER_SECTION_NAME,
+        section="update_manager KlipperScreen",
         instances=instances,
         options=[
             ("type", "git_repo"),
-            ("path", KLIPPERSCREEN_DIR.as_posix()),
-            ("origin", KLIPPERSCREEN_REPO),
-            ("managed_services", "KlipperScreen"),
-            ("env", f"{KLIPPERSCREEN_ENV_DIR}/bin/python"),
-            ("requirements", KLIPPERSCREEN_REQ_FILE.as_posix()),
-            ("install_script", KLIPPERSCREEN_INSTALL_SCRIPT.as_posix()),
+            ("path", str(KLIPPERSCREEN_DIR)),
+            ("orgin", KLIPPERSCREEN_REPO),
+            ("env", env_py),
+            ("requirements", "scripts/KlipperScreen-requirements.txt"),
+            ("install_script", "scripts/KlipperScreen-install.sh"),
         ],
     )
 
 
 def update_klipperscreen() -> None:
-    if not KLIPPERSCREEN_DIR.exists():
-        Logger.print_info("KlipperScreen does not seem to be installed! Skipping ...")
-        return
-
     try:
+        cmd_sysctl_service("KlipperScreen", "stop")
+
+        if not KLIPPERSCREEN_DIR.exists():
+            Logger.print_info(
+                "KlipperScreen does not seem to be installed! Skipping ..."
+            )
+            return
+
         Logger.print_status("Updating KlipperScreen ...")
 
-        cmd_sysctl_service(KLIPPERSCREEN_SERVICE_NAME, "stop")
+        cmd_sysctl_service("KlipperScreen", "stop")
 
         settings = KiauhSettings()
         if settings.kiauh.backup_before_update:
@@ -128,9 +129,12 @@ def update_klipperscreen() -> None:
 
         git_pull_wrapper(KLIPPERSCREEN_REPO, KLIPPERSCREEN_DIR)
 
-        install_python_requirements(KLIPPERSCREEN_ENV_DIR, KLIPPERSCREEN_REQ_FILE)
+        requirements = KLIPPERSCREEN_DIR.joinpath(
+            "/scripts/KlipperScreen-requirements.txt"
+        )
+        install_python_requirements(KLIPPERSCREEN_ENV, requirements)
 
-        cmd_sysctl_service(KLIPPERSCREEN_SERVICE_NAME, "start")
+        cmd_sysctl_service("KlipperScreen", "start")
 
         Logger.print_ok("KlipperScreen updated successfully.", end="\n\n")
     except CalledProcessError as e:
@@ -141,8 +145,8 @@ def update_klipperscreen() -> None:
 def get_klipperscreen_status() -> ComponentStatus:
     return get_install_status(
         KLIPPERSCREEN_DIR,
-        KLIPPERSCREEN_ENV_DIR,
-        files=[SYSTEMD.joinpath(KLIPPERSCREEN_SERVICE_NAME)],
+        KLIPPERSCREEN_ENV,
+        files=[SYSTEMD.joinpath("KlipperScreen.service")],
     )
 
 
@@ -156,31 +160,40 @@ def remove_klipperscreen() -> None:
         else:
             Logger.print_warn("KlipperScreen directory not found!")
 
-        if KLIPPERSCREEN_ENV_DIR.exists():
+        if KLIPPERSCREEN_ENV.exists():
             Logger.print_status("Removing KlipperScreen environment ...")
-            shutil.rmtree(KLIPPERSCREEN_ENV_DIR)
+            shutil.rmtree(KLIPPERSCREEN_ENV)
             Logger.print_ok("KlipperScreen environment successfully removed!")
         else:
             Logger.print_warn("KlipperScreen environment not found!")
 
-        if KLIPPERSCREEN_SERVICE_FILE.exists():
-            remove_system_service(KLIPPERSCREEN_SERVICE_NAME)
+        service = SYSTEMD.joinpath("KlipperScreen.service")
+        if service.exists():
+            Logger.print_status("Removing KlipperScreen service ...")
+            cmd_sysctl_service(service, "stop")
+            cmd_sysctl_service(service, "disable")
+            remove_with_sudo(service)
+            cmd_sysctl_manage("daemon-reload")
+            cmd_sysctl_manage("reset-failed")
+            Logger.print_ok("KlipperScreen service successfully removed!")
 
-        logfile = Path(f"/tmp/{KLIPPERSCREEN_LOG_NAME}")
+        logfile = Path("/tmp/KlipperScreen.log")
         if logfile.exists():
             Logger.print_status("Removing KlipperScreen log file ...")
             remove_with_sudo(logfile)
             Logger.print_ok("KlipperScreen log file successfully removed!")
 
-        kl_instances: List[Klipper] = get_instances(Klipper)
+        kl_im = InstanceManager(Klipper)
+        kl_instances: List[Klipper] = kl_im.instances
         for instance in kl_instances:
-            logfile = instance.base.log_dir.joinpath(KLIPPERSCREEN_LOG_NAME)
+            logfile = instance.log_dir.joinpath("KlipperScreen.log")
             if logfile.exists():
                 Logger.print_status(f"Removing {logfile} ...")
                 Path(logfile).unlink()
                 Logger.print_ok(f"{logfile} successfully removed!")
 
-        mr_instances: List[Moonraker] = get_instances(Moonraker)
+        mr_im = InstanceManager(Moonraker)
+        mr_instances: List[Moonraker] = mr_im.instances
         if mr_instances:
             Logger.print_status("Removing KlipperScreen from update manager ...")
             remove_config_section("update_manager KlipperScreen", mr_instances)
@@ -195,12 +208,12 @@ def remove_klipperscreen() -> None:
 def backup_klipperscreen_dir() -> None:
     bm = BackupManager()
     bm.backup_directory(
-        KLIPPERSCREEN_DIR.name,
+        "KlipperScreen",
         source=KLIPPERSCREEN_DIR,
         target=KLIPPERSCREEN_BACKUP_DIR,
     )
     bm.backup_directory(
-        KLIPPERSCREEN_ENV_DIR.name,
-        source=KLIPPERSCREEN_ENV_DIR,
+        "KlipperScreen-env",
+        source=KLIPPERSCREEN_ENV,
         target=KLIPPERSCREEN_BACKUP_DIR,
     )

kiauh/components/log_uploads/log_upload_utils.py

@@ -13,14 +13,13 @@ from typing import List
 
 from components.klipper.klipper import Klipper
 from components.log_uploads import LogFile
-from core.logger import Logger
-from utils.instance_utils import get_instances
+from core.instance_manager.instance_manager import InstanceManager
+from utils.logger import Logger
 
 
 def get_logfile_list() -> List[LogFile]:
-    log_dirs: List[Path] = [
-        instance.base.log_dir for instance in get_instances(Klipper)
-    ]
+    cm = InstanceManager(Klipper)
+    log_dirs: List[Path] = [instance.log_dir for instance in cm.instances]
 
     logfiles: List[LogFile] = []
     for _dir in log_dirs:

kiauh/components/log_uploads/menus/log_upload_menu.py

@@ -6,37 +6,37 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import textwrap
-from typing import Type
+from typing import Optional, 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.constants import COLOR_YELLOW, RESET_FORMAT
 
 
 # noinspection PyMethodMayBeStatic
 class LogUploadMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None):
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
+        self.previous_menu = previous_menu
         self.logfile_list = get_logfile_list()
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         from core.menus.main_menu import MainMenu
 
-        self.previous_menu = previous_menu if previous_menu is not None else MainMenu
+        self.previous_menu: Type[BaseMenu] = (
+            previous_menu if previous_menu is not None else MainMenu
+        )
 
     def set_options(self) -> None:
         self.options = {
-            f"{index}": Option(self.upload, opt_index=f"{index}")
+            f"{index}": Option(self.upload, False, opt_index=f"{index}")
             for index in range(len(self.logfile_list))
         }
 
-    def print_menu(self) -> None:
+    def print_menu(self):
         header = " [ Log Upload ] "
         color = COLOR_YELLOW
         count = 62 - len(color) - len(RESET_FORMAT)
@@ -58,13 +58,5 @@ class LogUploadMenu(BaseMenu):
         print(menu, end="")
 
     def upload(self, **kwargs):
-        try:
-            index: int | None = kwargs.get("opt_index", None)
-            if index is None:
-                raise Exception("opt_index is None")
-
-            index = int(index)
-            upload_logfile(self.logfile_list[index])
-        except Exception as e:
-            Logger.print_error(e)
-            Logger.print_error("Log upload failed!")
+        index = int(kwargs.get("opt_index"))
+        upload_logfile(self.logfile_list[index])

kiauh/components/mobileraker/__init__.py

@@ -9,22 +9,8 @@
 from pathlib import Path
 
 from core.backup_manager import BACKUP_ROOT_DIR
-from core.constants import SYSTEMD
 
-# repo
 MOBILERAKER_REPO = "https://github.com/Clon1998/mobileraker_companion.git"
-
-# names
-MOBILERAKER_SERVICE_NAME = "mobileraker.service"
-MOBILERAKER_UPDATER_SECTION_NAME = "update_manager mobileraker"
-MOBILERAKER_LOG_NAME = "mobileraker.log"
-
-# directories
 MOBILERAKER_DIR = Path.home().joinpath("mobileraker_companion")
-MOBILERAKER_ENV_DIR = Path.home().joinpath("mobileraker-env")
+MOBILERAKER_ENV = Path.home().joinpath("mobileraker-env")
 MOBILERAKER_BACKUP_DIR = BACKUP_ROOT_DIR.joinpath("mobileraker-backups")
-
-# files
-MOBILERAKER_INSTALL_SCRIPT = MOBILERAKER_DIR.joinpath("scripts/install.sh")
-MOBILERAKER_REQ_FILE = MOBILERAKER_DIR.joinpath("scripts/mobileraker-requirements.txt")
-MOBILERAKER_SERVICE_FILE = SYSTEMD.joinpath(MOBILERAKER_SERVICE_NAME)

kiauh/components/mobileraker/mobileraker.py

@@ -15,35 +15,30 @@ from components.klipper.klipper import Klipper
 from components.mobileraker import (
     MOBILERAKER_BACKUP_DIR,
     MOBILERAKER_DIR,
-    MOBILERAKER_ENV_DIR,
-    MOBILERAKER_INSTALL_SCRIPT,
-    MOBILERAKER_LOG_NAME,
+    MOBILERAKER_ENV,
     MOBILERAKER_REPO,
-    MOBILERAKER_REQ_FILE,
-    MOBILERAKER_SERVICE_FILE,
-    MOBILERAKER_SERVICE_NAME,
-    MOBILERAKER_UPDATER_SECTION_NAME,
 )
 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 core.types import ComponentStatus
 from utils.common import check_install_dependencies, get_install_status
 from utils.config_utils import add_config_section, remove_config_section
+from utils.constants import SYSTEMD
+from utils.fs_utils import remove_with_sudo
 from utils.git_utils import (
     git_clone_wrapper,
     git_pull_wrapper,
 )
 from utils.input_utils import get_confirm
-from utils.instance_utils import get_instances
+from utils.logger import DialogType, Logger
 from utils.sys_utils import (
     check_python_version,
+    cmd_sysctl_manage,
     cmd_sysctl_service,
     install_python_requirements,
-    remove_system_service,
 )
+from utils.types import ComponentStatus
 
 
 def install_mobileraker() -> None:
@@ -52,7 +47,8 @@ def install_mobileraker() -> None:
     if not check_python_version(3, 7):
         return
 
-    mr_instances = get_instances(Moonraker)
+    mr_im = InstanceManager(Moonraker)
+    mr_instances = mr_im.instances
     if not mr_instances:
         Logger.print_dialog(
             DialogType.WARNING,
@@ -62,6 +58,7 @@ def install_mobileraker() -> None:
                 "Mobileraker's companion's update manager configuration for Moonraker "
                 "will not be added to any moonraker.conf.",
             ],
+            end="",
         )
         if not get_confirm(
             "Continue Mobileraker's companion installation?",
@@ -70,15 +67,17 @@ def install_mobileraker() -> None:
         ):
             return
 
-    check_install_dependencies()
+    package_list = ["git", "wget", "curl", "unzip", "dfu-util"]
+    check_install_dependencies(package_list)
 
     git_clone_wrapper(MOBILERAKER_REPO, MOBILERAKER_DIR)
 
     try:
-        run(MOBILERAKER_INSTALL_SCRIPT.as_posix(), shell=True, check=True)
+        script = f"{MOBILERAKER_DIR}/scripts/install.sh"
+        run(script, shell=True, check=True)
         if mr_instances:
             patch_mobileraker_update_manager(mr_instances)
-            InstanceManager.restart_all(mr_instances)
+            mr_im.restart_all_instance()
         else:
             Logger.print_info(
                 "Moonraker is not installed! Cannot add Mobileraker's "
@@ -91,18 +90,19 @@ def install_mobileraker() -> None:
 
 
 def patch_mobileraker_update_manager(instances: List[Moonraker]) -> None:
+    env_py = f"{MOBILERAKER_ENV}/bin/python"
     add_config_section(
-        section=MOBILERAKER_UPDATER_SECTION_NAME,
+        section="update_manager mobileraker",
         instances=instances,
         options=[
             ("type", "git_repo"),
-            ("path", MOBILERAKER_DIR.as_posix()),
-            ("origin", MOBILERAKER_REPO),
+            ("path", "mobileraker_companion"),
+            ("orgin", MOBILERAKER_REPO),
             ("primary_branch", "main"),
             ("managed_services", "mobileraker"),
-            ("env", f"{MOBILERAKER_ENV_DIR}/bin/python"),
-            ("requirements", MOBILERAKER_REQ_FILE.as_posix()),
-            ("install_script", MOBILERAKER_INSTALL_SCRIPT.as_posix()),
+            ("env", env_py),
+            ("requirements", "scripts/mobileraker-requirements.txt"),
+            ("install_script", "scripts/install.sh"),
         ],
     )
 
@@ -117,7 +117,7 @@ def update_mobileraker() -> None:
 
         Logger.print_status("Updating Mobileraker's companion ...")
 
-        cmd_sysctl_service(MOBILERAKER_SERVICE_NAME, "stop")
+        cmd_sysctl_service("mobileraker", "stop")
 
         settings = KiauhSettings()
         if settings.kiauh.backup_before_update:
@@ -125,9 +125,10 @@ def update_mobileraker() -> None:
 
         git_pull_wrapper(MOBILERAKER_REPO, MOBILERAKER_DIR)
 
-        install_python_requirements(MOBILERAKER_ENV_DIR, MOBILERAKER_REQ_FILE)
+        requirements = MOBILERAKER_DIR.joinpath("/scripts/mobileraker-requirements.txt")
+        install_python_requirements(MOBILERAKER_ENV, requirements)
 
-        cmd_sysctl_service(MOBILERAKER_SERVICE_NAME, "start")
+        cmd_sysctl_service("mobileraker", "start")
 
         Logger.print_ok("Mobileraker's companion updated successfully.", end="\n\n")
     except CalledProcessError as e:
@@ -138,8 +139,8 @@ def update_mobileraker() -> None:
 def get_mobileraker_status() -> ComponentStatus:
     return get_install_status(
         MOBILERAKER_DIR,
-        MOBILERAKER_ENV_DIR,
-        files=[MOBILERAKER_SERVICE_FILE],
+        MOBILERAKER_ENV,
+        files=[SYSTEMD.joinpath("mobileraker.service")],
     )
 
 
@@ -153,30 +154,39 @@ def remove_mobileraker() -> None:
         else:
             Logger.print_warn("Mobileraker's companion directory not found!")
 
-        if MOBILERAKER_ENV_DIR.exists():
+        if MOBILERAKER_ENV.exists():
             Logger.print_status("Removing Mobileraker's companion environment ...")
-            shutil.rmtree(MOBILERAKER_ENV_DIR)
+            shutil.rmtree(MOBILERAKER_ENV)
             Logger.print_ok("Mobileraker's companion environment successfully removed!")
         else:
             Logger.print_warn("Mobileraker's companion environment not found!")
 
-        if MOBILERAKER_SERVICE_FILE.exists():
-            remove_system_service(MOBILERAKER_SERVICE_NAME)
+        service = SYSTEMD.joinpath("mobileraker.service")
+        if service.exists():
+            Logger.print_status("Removing mobileraker service ...")
+            cmd_sysctl_service(service, "stop")
+            cmd_sysctl_service(service, "disable")
+            remove_with_sudo(service)
+            cmd_sysctl_manage("daemon-reload")
+            cmd_sysctl_manage("reset-failed")
+            Logger.print_ok("Mobileraker's companion service successfully removed!")
 
-        kl_instances: List[Klipper] = get_instances(Klipper)
+        kl_im = InstanceManager(Klipper)
+        kl_instances: List[Klipper] = kl_im.instances
         for instance in kl_instances:
-            logfile = instance.base.log_dir.joinpath(MOBILERAKER_LOG_NAME)
+            logfile = instance.log_dir.joinpath("mobileraker.log")
             if logfile.exists():
                 Logger.print_status(f"Removing {logfile} ...")
                 Path(logfile).unlink()
                 Logger.print_ok(f"{logfile} successfully removed!")
 
-        mr_instances: List[Moonraker] = get_instances(Moonraker)
+        mr_im = InstanceManager(Moonraker)
+        mr_instances: List[Moonraker] = mr_im.instances
         if mr_instances:
             Logger.print_status(
                 "Removing Mobileraker's companion from update manager ..."
             )
-            remove_config_section(MOBILERAKER_UPDATER_SECTION_NAME, mr_instances)
+            remove_config_section("update_manager mobileraker", mr_instances)
             Logger.print_ok(
                 "Mobileraker's companion successfully removed from update manager!"
             )
@@ -190,12 +200,12 @@ def remove_mobileraker() -> None:
 def backup_mobileraker_dir() -> None:
     bm = BackupManager()
     bm.backup_directory(
-        MOBILERAKER_DIR.name,
+        "mobileraker_companion",
         source=MOBILERAKER_DIR,
         target=MOBILERAKER_BACKUP_DIR,
     )
     bm.backup_directory(
-        MOBILERAKER_ENV_DIR.name,
-        source=MOBILERAKER_ENV_DIR,
+        "mobileraker-env",
+        source=MOBILERAKER_ENV,
         target=MOBILERAKER_BACKUP_DIR,
     )

kiauh/components/moonraker/__init__.py

@@ -13,33 +13,21 @@ from core.backup_manager import BACKUP_ROOT_DIR
 
 MODULE_PATH = Path(__file__).resolve().parent
 
-# names
-MOONRAKER_CFG_NAME = "moonraker.conf"
-MOONRAKER_LOG_NAME = "moonraker.log"
-MOONRAKER_SERVICE_NAME = "moonraker.service"
-MOONRAKER_DEFAULT_PORT = 7125
-MOONRAKER_ENV_FILE_NAME = "moonraker.env"
-
-# directories
 MOONRAKER_DIR = Path.home().joinpath("moonraker")
 MOONRAKER_ENV_DIR = Path.home().joinpath("moonraker-env")
 MOONRAKER_BACKUP_DIR = BACKUP_ROOT_DIR.joinpath("moonraker-backups")
 MOONRAKER_DB_BACKUP_DIR = BACKUP_ROOT_DIR.joinpath("moonraker-db-backups")
+MOONRAKER_REQUIREMENTS_TXT = MOONRAKER_DIR.joinpath(
+    "scripts/moonraker-requirements.txt"
+)
+DEFAULT_MOONRAKER_PORT = 7125
 
-# files
-MOONRAKER_INSTALL_SCRIPT = MOONRAKER_DIR.joinpath("scripts/install-moonraker.sh")
-MOONRAKER_REQ_FILE = MOONRAKER_DIR.joinpath("scripts/moonraker-requirements.txt")
-MOONRAKER_SPEEDUPS_REQ_FILE = MOONRAKER_DIR.joinpath("scripts/moonraker-speedups.txt")
-MOONRAKER_DEPS_JSON_FILE = MOONRAKER_DIR.joinpath("scripts/system-dependencies.json")
 # introduced due to
 # https://github.com/Arksine/moonraker/issues/349
 # https://github.com/Arksine/moonraker/pull/346
 POLKIT_LEGACY_FILE = Path("/etc/polkit-1/localauthority/50-local.d/10-moonraker.pkla")
 POLKIT_FILE = Path("/etc/polkit-1/rules.d/moonraker.rules")
 POLKIT_USR_FILE = Path("/usr/share/polkit-1/rules.d/moonraker.rules")
-POLKIT_SCRIPT = MOONRAKER_DIR.joinpath("scripts/set-policykit-rules.sh")
-MOONRAKER_SERVICE_TEMPLATE = MODULE_PATH.joinpath(f"assets/{MOONRAKER_SERVICE_NAME}")
-MOONRAKER_ENV_FILE_TEMPLATE = MODULE_PATH.joinpath(f"assets/{MOONRAKER_ENV_FILE_NAME}")
-
+POLKIT_SCRIPT = Path.home().joinpath("moonraker/scripts/set-policykit-rules.sh")
 
 EXIT_MOONRAKER_SETUP = "Exiting Moonraker setup ..."

kiauh/components/moonraker/menus/moonraker_remove_menu.py

@@ -6,41 +6,43 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import textwrap
-from typing import Type
+from typing import Optional, Type
 
 from components.moonraker import moonraker_remove
-from core.constants import COLOR_CYAN, COLOR_RED, RESET_FORMAT
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
+from utils.constants import COLOR_CYAN, COLOR_RED, RESET_FORMAT
 
 
 # noinspection PyUnusedLocal
 class MoonrakerRemoveMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None):
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
+        self.previous_menu = previous_menu
         self.remove_moonraker_service = False
         self.remove_moonraker_dir = False
         self.remove_moonraker_env = False
         self.remove_moonraker_polkit = False
-        self.selection_state = False
+        self.delete_moonraker_logs = False
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         from core.menus.remove_menu import RemoveMenu
 
-        self.previous_menu = previous_menu if previous_menu is not None else RemoveMenu
+        self.previous_menu: Type[BaseMenu] = (
+            previous_menu if previous_menu is not None else RemoveMenu
+        )
 
     def set_options(self) -> None:
         self.options = {
-            "a": Option(method=self.toggle_all),
-            "1": Option(method=self.toggle_remove_moonraker_service),
-            "2": Option(method=self.toggle_remove_moonraker_dir),
-            "3": Option(method=self.toggle_remove_moonraker_env),
-            "4": Option(method=self.toggle_remove_moonraker_polkit),
-            "c": Option(method=self.run_removal_process),
+            "0": Option(method=self.toggle_all, menu=False),
+            "1": Option(method=self.toggle_remove_moonraker_service, menu=False),
+            "2": Option(method=self.toggle_remove_moonraker_dir, menu=False),
+            "3": Option(method=self.toggle_remove_moonraker_env, menu=False),
+            "4": Option(method=self.toggle_remove_moonraker_polkit, menu=False),
+            "5": Option(method=self.toggle_delete_moonraker_logs, menu=False),
+            "c": Option(method=self.run_removal_process, menu=False),
         }
 
     def print_menu(self) -> None:
@@ -53,6 +55,7 @@ class MoonrakerRemoveMenu(BaseMenu):
         o2 = checked if self.remove_moonraker_dir else unchecked
         o3 = checked if self.remove_moonraker_env else unchecked
         o4 = checked if self.remove_moonraker_polkit else unchecked
+        o5 = checked if self.delete_moonraker_logs else unchecked
         menu = textwrap.dedent(
             f"""
             ╔═══════════════════════════════════════════════════════╗
@@ -61,12 +64,13 @@ class MoonrakerRemoveMenu(BaseMenu):
             ║ Enter a number and hit enter to select / deselect     ║
             ║ the specific option for removal.                      ║
             ╟───────────────────────────────────────────────────────╢
-            ║  a) {self._get_selection_state_str():37}             ║
+            ║  0) Select everything                                 ║
             ╟───────────────────────────────────────────────────────╢
             ║  1) {o1} Remove Service                                ║
             ║  2) {o2} Remove Local Repository                       ║
             ║  3) {o3} Remove Python Environment                     ║
             ║  4) {o4} Remove Policy Kit Rules                       ║
+            ║  5) {o5} Delete all Log-Files                          ║
             ╟───────────────────────────────────────────────────────╢
             ║  C) Continue                                          ║
             ╟───────────────────────────────────────────────────────╢
@@ -75,11 +79,11 @@ class MoonrakerRemoveMenu(BaseMenu):
         print(menu, end="")
 
     def toggle_all(self, **kwargs) -> None:
-        self.selection_state = not self.selection_state
-        self.remove_moonraker_service = self.selection_state
-        self.remove_moonraker_dir = self.selection_state
-        self.remove_moonraker_env = self.selection_state
-        self.remove_moonraker_polkit = self.selection_state
+        self.remove_moonraker_service = True
+        self.remove_moonraker_dir = True
+        self.remove_moonraker_env = True
+        self.remove_moonraker_polkit = True
+        self.delete_moonraker_logs = True
 
     def toggle_remove_moonraker_service(self, **kwargs) -> None:
         self.remove_moonraker_service = not self.remove_moonraker_service
@@ -93,12 +97,16 @@ class MoonrakerRemoveMenu(BaseMenu):
     def toggle_remove_moonraker_polkit(self, **kwargs) -> None:
         self.remove_moonraker_polkit = not self.remove_moonraker_polkit
 
+    def toggle_delete_moonraker_logs(self, **kwargs) -> None:
+        self.delete_moonraker_logs = not self.delete_moonraker_logs
+
     def run_removal_process(self, **kwargs) -> None:
         if (
             not self.remove_moonraker_service
             and not self.remove_moonraker_dir
             and not self.remove_moonraker_env
             and not self.remove_moonraker_polkit
+            and not self.delete_moonraker_logs
         ):
             error = f"{COLOR_RED}Nothing selected! Select options to remove first.{RESET_FORMAT}"
             print(error)
@@ -109,20 +117,11 @@ class MoonrakerRemoveMenu(BaseMenu):
             self.remove_moonraker_dir,
             self.remove_moonraker_env,
             self.remove_moonraker_polkit,
+            self.delete_moonraker_logs,
         )
 
         self.remove_moonraker_service = False
         self.remove_moonraker_dir = False
         self.remove_moonraker_env = False
         self.remove_moonraker_polkit = False
-
-        self._go_back()
-
-    def _get_selection_state_str(self) -> str:
-        return (
-            "Select everything" if not self.selection_state else "Deselect everything"
-        )
-
-    def _go_back(self, **kwargs) -> None:
-        if self.previous_menu is not None:
-            self.previous_menu().run()
+        self.delete_moonraker_logs = False

kiauh/components/moonraker/moonraker.py

@@ -8,137 +8,151 @@
 # ======================================================================= #
 from __future__ import annotations
 
-from dataclasses import dataclass, field
+import subprocess
 from pathlib import Path
-from subprocess import CalledProcessError
+from typing import List
 
-from components.klipper.klipper import Klipper
-from components.moonraker import (
-    MOONRAKER_CFG_NAME,
-    MOONRAKER_DIR,
-    MOONRAKER_ENV_DIR,
-    MOONRAKER_ENV_FILE_NAME,
-    MOONRAKER_ENV_FILE_TEMPLATE,
-    MOONRAKER_LOG_NAME,
-    MOONRAKER_SERVICE_TEMPLATE,
-)
-from core.constants import CURRENT_USER
+from components.moonraker import MODULE_PATH, MOONRAKER_DIR, MOONRAKER_ENV_DIR
 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.fs_utils import create_folders
-from utils.sys_utils import get_service_file_path
+from utils.constants import SYSTEMD
+from utils.logger import Logger
 
 
 # noinspection PyMethodMayBeStatic
-@dataclass
-class Moonraker:
-    suffix: str
-    base: BaseInstance = field(init=False, repr=False)
-    service_file_path: Path = field(init=False)
-    log_file_name: str = MOONRAKER_LOG_NAME
-    moonraker_dir: Path = MOONRAKER_DIR
-    env_dir: Path = MOONRAKER_ENV_DIR
-    data_dir: Path = field(init=False)
-    cfg_file: Path = field(init=False)
-    backup_dir: Path = field(init=False)
-    certs_dir: Path = field(init=False)
-    db_dir: Path = field(init=False)
-    port: int | None = field(init=False)
+class Moonraker(BaseInstance):
+    @classmethod
+    def blacklist(cls) -> List[str]:
+        return ["None", "mcu", "obico"]
 
-    def __post_init__(self):
-        self.base: BaseInstance = BaseInstance(Klipper, self.suffix)
-        self.base.log_file_name = self.log_file_name
+    def __init__(self, suffix: str = ""):
+        super().__init__(instance_type=self, suffix=suffix)
+        self.moonraker_dir: Path = MOONRAKER_DIR
+        self.env_dir: Path = MOONRAKER_ENV_DIR
+        self.cfg_file = self.cfg_dir.joinpath("moonraker.conf")
+        self.port = self._get_port()
+        self.backup_dir = self.data_dir.joinpath("backup")
+        self.certs_dir = self.data_dir.joinpath("certs")
+        self._db_dir = self.data_dir.joinpath("database")
+        self._comms_dir = self.data_dir.joinpath("comms")
+        self.log = self.log_dir.joinpath("moonraker.log")
 
-        self.service_file_path: Path = get_service_file_path(Moonraker, self.suffix)
-        self.data_dir: Path = self.base.data_dir
-        self.cfg_file: Path = self.base.cfg_dir.joinpath(MOONRAKER_CFG_NAME)
-        self.backup_dir: Path = self.base.data_dir.joinpath("backup")
-        self.certs_dir: Path = self.base.data_dir.joinpath("certs")
-        self.db_dir: Path = self.base.data_dir.joinpath("database")
-        self.port: int | None = self._get_port()
+    @property
+    def db_dir(self) -> Path:
+        return self._db_dir
 
-    def create(self) -> None:
-        from utils.sys_utils import create_env_file, create_service_file
+    @property
+    def comms_dir(self) -> Path:
+        return self._comms_dir
 
+    def create(self, create_example_cfg: bool = False) -> None:
         Logger.print_status("Creating new Moonraker Instance ...")
+        service_template_path = MODULE_PATH.joinpath("assets/moonraker.service")
+        env_template_file_path = MODULE_PATH.joinpath("assets/moonraker.env")
+        service_file_name = self.get_service_file_name(extension=True)
+        service_file_target = SYSTEMD.joinpath(service_file_name)
+        env_file_target = self.sysd_dir.joinpath("moonraker.env")
 
         try:
-            create_folders(self.base.base_folders)
-
-            create_service_file(
-                name=self.service_file_path.name,
-                content=self._prep_service_file_content(),
-            )
-            create_env_file(
-                path=self.base.sysd_dir.joinpath(MOONRAKER_ENV_FILE_NAME),
-                content=self._prep_env_file_content(),
+            self.create_folders([self.backup_dir, self.certs_dir, self._db_dir])
+            self.write_service_file(
+                service_template_path, service_file_target, env_file_target
             )
+            self.write_env_file(env_template_file_path, env_file_target)
 
-        except CalledProcessError as e:
-            Logger.print_error(f"Error creating instance: {e}")
+        except subprocess.CalledProcessError as e:
+            Logger.print_error(
+                f"Error creating service file {service_file_target}: {e}"
+            )
             raise
         except OSError as e:
-            Logger.print_error(f"Error creating env file: {e}")
+            Logger.print_error(f"Error writing file: {e}")
             raise
 
-    def _prep_service_file_content(self) -> str:
-        template = MOONRAKER_SERVICE_TEMPLATE
+    def delete(self) -> None:
+        service_file = self.get_service_file_name(extension=True)
+        service_file_path = self.get_service_file_path()
+
+        Logger.print_status(f"Deleting Moonraker Instance: {service_file}")
 
         try:
-            with open(template, "r") as template_file:
+            command = ["sudo", "rm", "-f", service_file_path]
+            subprocess.run(command, check=True)
+            Logger.print_ok(f"Service file deleted: {service_file_path}")
+        except subprocess.CalledProcessError as e:
+            Logger.print_error(f"Error deleting service file: {e}")
+            raise
+
+    def write_service_file(
+        self,
+        service_template_path: Path,
+        service_file_target: Path,
+        env_file_target: Path,
+    ) -> None:
+        service_content = self._prep_service_file(
+            service_template_path, env_file_target
+        )
+        command = ["sudo", "tee", service_file_target]
+        subprocess.run(
+            command,
+            input=service_content.encode(),
+            stdout=subprocess.DEVNULL,
+            check=True,
+        )
+        Logger.print_ok(f"Service file created: {service_file_target}")
+
+    def write_env_file(
+        self, env_template_file_path: Path, env_file_target: Path
+    ) -> None:
+        env_file_content = self._prep_env_file(env_template_file_path)
+        with open(env_file_target, "w") as env_file:
+            env_file.write(env_file_content)
+        Logger.print_ok(f"Env file created: {env_file_target}")
+
+    def _prep_service_file(
+        self, service_template_path: Path, env_file_path: Path
+    ) -> str:
+        try:
+            with open(service_template_path, "r") as template_file:
                 template_content = template_file.read()
         except FileNotFoundError:
-            Logger.print_error(f"Unable to open {template} - File not found")
+            Logger.print_error(
+                f"Unable to open {service_template_path} - File not found"
+            )
             raise
-
-        service_content = template_content.replace(
-            "%USER%",
-            CURRENT_USER,
-        )
+        service_content = template_content.replace("%USER%", self.user)
         service_content = service_content.replace(
-            "%MOONRAKER_DIR%",
-            self.moonraker_dir.as_posix(),
-        )
-        service_content = service_content.replace(
-            "%ENV%",
-            self.env_dir.as_posix(),
-        )
-        service_content = service_content.replace(
-            "%ENV_FILE%",
-            self.base.sysd_dir.joinpath(MOONRAKER_ENV_FILE_NAME).as_posix(),
+            "%MOONRAKER_DIR%", str(self.moonraker_dir)
         )
+        service_content = service_content.replace("%ENV%", str(self.env_dir))
+        service_content = service_content.replace("%ENV_FILE%", str(env_file_path))
         return service_content
 
-    def _prep_env_file_content(self) -> str:
-        template = MOONRAKER_ENV_FILE_TEMPLATE
-
+    def _prep_env_file(self, env_template_file_path: Path) -> str:
         try:
-            with open(template, "r") as env_file:
+            with open(env_template_file_path, "r") as env_file:
                 env_template_file_content = env_file.read()
         except FileNotFoundError:
-            Logger.print_error(f"Unable to open {template} - File not found")
+            Logger.print_error(
+                f"Unable to open {env_template_file_path} - File not found"
+            )
             raise
-
         env_file_content = env_template_file_content.replace(
-            "%MOONRAKER_DIR%",
-            self.moonraker_dir.as_posix(),
+            "%MOONRAKER_DIR%", str(self.moonraker_dir)
         )
         env_file_content = env_file_content.replace(
-            "%PRINTER_DATA%",
-            self.base.data_dir.as_posix(),
+            "%PRINTER_DATA%", str(self.data_dir)
         )
-
         return env_file_content
 
     def _get_port(self) -> int | None:
-        if not self.cfg_file or not self.cfg_file.is_file():
+        if not self.cfg_file.is_file():
             return None
 
         scp = SimpleConfigParser()
         scp.read(self.cfg_file)
-        port: int | None = scp.getint("server", "port", fallback=None)
+        port = scp.getint("server", "port", fallback=None)
 
         return port

kiauh/components/moonraker/moonraker_dialogs.py

@@ -12,8 +12,8 @@ from typing import List
 
 from components.klipper.klipper import Klipper
 from components.moonraker.moonraker import Moonraker
-from core.constants import COLOR_CYAN, COLOR_GREEN, COLOR_YELLOW, RESET_FORMAT
 from core.menus.base_menu import print_back_footer
+from utils.constants import COLOR_CYAN, COLOR_GREEN, COLOR_YELLOW, RESET_FORMAT
 
 
 def print_moonraker_overview(
@@ -37,8 +37,8 @@ def print_moonraker_overview(
         dialog += "║                                                       ║\n"
 
     instance_map = {
-        k.service_file_path.stem: (
-            k.service_file_path.stem.replace("klipper", "moonraker")
+        k.get_service_file_name(): (
+            k.get_service_file_name().replace("klipper", "moonraker")
             if k.suffix in [m.suffix for m in moonraker_instances]
             else ""
         )
@@ -48,7 +48,7 @@ def print_moonraker_overview(
     for i, k in enumerate(instance_map):
         mr_name = instance_map.get(k)
         m = f"<-> {mr_name}" if mr_name != "" else ""
-        line = f"{COLOR_CYAN}{f'{i+1})' if show_index else '●'} {k} {m} {RESET_FORMAT}"
+        line = f"{COLOR_CYAN}{f'{i})' if show_index else '●'} {k} {m} {RESET_FORMAT}"
         dialog += f"║ {line:<63}║\n"
 
     warn_l1 = f"{COLOR_YELLOW}PLEASE NOTE: {RESET_FORMAT}"

kiauh/components/moonraker/moonraker_remove.py

@@ -6,20 +6,19 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
-from subprocess import DEVNULL, PIPE, CalledProcessError, run
-from typing import List
+import shutil
+import subprocess
+from typing import List, Union
 
 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.fs_utils import remove_file
 from utils.input_utils import get_selection_input
-from utils.instance_utils import get_instances
-from utils.sys_utils import unit_file_exists
+from utils.logger import Logger
+from utils.sys_utils import cmd_sysctl_manage
 
 
 def run_moonraker_removal(
@@ -27,73 +26,102 @@ def run_moonraker_removal(
     remove_dir: bool,
     remove_env: bool,
     remove_polkit: bool,
+    delete_logs: bool,
 ) -> None:
-    instances = get_instances(Moonraker)
+    im = InstanceManager(Moonraker)
 
     if remove_service:
         Logger.print_status("Removing Moonraker instances ...")
-        if instances:
-            instances_to_remove = select_instances_to_remove(instances)
-            remove_instances(instances_to_remove)
+        if im.instances:
+            instances_to_remove = select_instances_to_remove(im.instances)
+            remove_instances(im, instances_to_remove)
         else:
             Logger.print_info("No Moonraker Services installed! Skipped ...")
 
-    delete_remaining: bool = remove_polkit or remove_dir or remove_env
-    if delete_remaining and unit_file_exists("moonraker", suffix="service"):
-        Logger.print_info("There are still other Moonraker services installed")
-        Logger.print_info(
-            "●  Moonraker PolicyKit rules were not removed.", prefix=False
+    if (remove_polkit or remove_dir or remove_env) and im.instances:
+        Logger.print_warn("There are still other Moonraker services installed!")
+        Logger.print_warn("Therefor the following parts cannot be removed:")
+        Logger.print_warn(
+            """
+            ● Moonraker PolicyKit rules
+            ● Moonraker local repository
+            ● Moonraker Python environment
+            """,
+            False,
         )
-        Logger.print_info(f"● '{MOONRAKER_DIR}' was not removed.", prefix=False)
-        Logger.print_info(f"● '{MOONRAKER_ENV_DIR}' was not removed.", prefix=False)
     else:
         if remove_polkit:
             Logger.print_status("Removing all Moonraker policykit rules ...")
             remove_polkit_rules()
         if remove_dir:
             Logger.print_status("Removing Moonraker local repository ...")
-            run_remove_routines(MOONRAKER_DIR)
+            remove_moonraker_dir()
         if remove_env:
             Logger.print_status("Removing Moonraker Python environment ...")
-            run_remove_routines(MOONRAKER_ENV_DIR)
+            remove_moonraker_env()
+
+    # delete moonraker logs of all instances
+    if delete_logs:
+        Logger.print_status("Removing all Moonraker logs ...")
+        delete_moonraker_logs(im.instances)
 
 
 def select_instances_to_remove(
     instances: List[Moonraker],
-) -> List[Moonraker] | None:
-    start_index = 1
-    options = [str(i + start_index) for i in range(len(instances))]
-    options.extend(["a", "b"])
-    instance_map = {options[i]: instances[i] for i in range(len(instances))}
+) -> Union[List[Moonraker], None]:
+    print_instance_overview(instances, show_index=True, show_select_all=True)
+
+    options = [str(i) for i in range(len(instances))]
+    options.extend(["a", "A", "b", "B"])
 
-    print_instance_overview(
-        instances,
-        start_index=start_index,
-        show_index=True,
-        show_select_all=True,
-    )
     selection = get_selection_input("Select Moonraker instance to remove", options)
 
     instances_to_remove = []
-    if selection == "b":
+    if selection == "b".lower():
         return None
-    elif selection == "a":
+    elif selection == "a".lower():
         instances_to_remove.extend(instances)
     else:
-        instances_to_remove.append(instance_map[selection])
+        instance = instances[int(selection)]
+        instances_to_remove.append(instance)
 
     return instances_to_remove
 
 
 def remove_instances(
-    instance_list: List[Moonraker] | None,
+    instance_manager: InstanceManager,
+    instance_list: List[Moonraker],
 ) -> None:
-    if not instance_list:
-        Logger.print_info("No Moonraker instances found. Skipped ...")
-        return
     for instance in instance_list:
-        Logger.print_status(f"Removing instance {instance.service_file_path.stem} ...")
-        InstanceManager.remove(instance)
+        Logger.print_status(f"Removing instance {instance.get_service_file_name()} ...")
+        instance_manager.current_instance = instance
+        instance_manager.stop_instance()
+        instance_manager.disable_instance()
+        instance_manager.delete_instance()
+
+    cmd_sysctl_manage("daemon-reload")
+
+
+def remove_moonraker_dir() -> None:
+    if not MOONRAKER_DIR.exists():
+        Logger.print_info(f"'{MOONRAKER_DIR}' does not exist. Skipped ...")
+        return
+
+    try:
+        shutil.rmtree(MOONRAKER_DIR)
+    except OSError as e:
+        Logger.print_error(f"Unable to delete '{MOONRAKER_DIR}':\n{e}")
+
+
+def remove_moonraker_env() -> None:
+    if not MOONRAKER_ENV_DIR.exists():
+        Logger.print_info(f"'{MOONRAKER_ENV_DIR}' does not exist. Skipped ...")
+        return
+
+    try:
+        shutil.rmtree(MOONRAKER_ENV_DIR)
+    except OSError as e:
+        Logger.print_error(f"Unable to delete '{MOONRAKER_ENV_DIR}':\n{e}")
 
 
 def remove_polkit_rules() -> None:
@@ -103,9 +131,17 @@ def remove_polkit_rules() -> None:
         return
 
     try:
-        cmd = [f"{MOONRAKER_DIR}/scripts/set-policykit-rules.sh", "--clear"]
-        run(cmd, stderr=PIPE, stdout=DEVNULL, check=True)
-    except CalledProcessError as e:
+        command = [
+            f"{MOONRAKER_DIR}/scripts/set-policykit-rules.sh",
+            "--clear",
+        ]
+        subprocess.run(
+            command,
+            stderr=subprocess.PIPE,
+            stdout=subprocess.DEVNULL,
+            check=True,
+        )
+    except subprocess.CalledProcessError as e:
         Logger.print_error(f"Error while removing policykit rules: {e}")
 
     Logger.print_ok("Policykit rules successfully removed!")
@@ -114,11 +150,11 @@ def remove_polkit_rules() -> None:
 def delete_moonraker_logs(instances: List[Moonraker]) -> None:
     all_logfiles = []
     for instance in instances:
-        all_logfiles = list(instance.base.log_dir.glob("moonraker.log*"))
+        all_logfiles = list(instance.log_dir.glob("moonraker.log*"))
     if not all_logfiles:
         Logger.print_info("No Moonraker logs found. Skipped ...")
         return
 
     for log in all_logfiles:
         Logger.print_status(f"Remove '{log}'")
-        run_remove_routines(log)
+        remove_file(log)

kiauh/components/moonraker/moonraker_setup.py

@@ -6,21 +6,16 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
-
 import json
 import subprocess
-from typing import List
+from pathlib import Path
 
 from components.klipper.klipper import Klipper
 from components.moonraker import (
     EXIT_MOONRAKER_SETUP,
-    MOONRAKER_DEPS_JSON_FILE,
     MOONRAKER_DIR,
     MOONRAKER_ENV_DIR,
-    MOONRAKER_INSTALL_SCRIPT,
-    MOONRAKER_REQ_FILE,
-    MOONRAKER_SPEEDUPS_REQ_FILE,
+    MOONRAKER_REQUIREMENTS_TXT,
     POLKIT_FILE,
     POLKIT_LEGACY_FILE,
     POLKIT_SCRIPT,
@@ -38,7 +33,6 @@ 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
@@ -47,11 +41,10 @@ from utils.input_utils import (
     get_confirm,
     get_selection_input,
 )
-from utils.instance_utils import get_instances
+from utils.logger import Logger
 from utils.sys_utils import (
     check_python_version,
     cmd_sysctl_manage,
-    cmd_sysctl_service,
     create_python_venv,
     install_python_requirements,
     parse_packages_from_file,
@@ -59,67 +52,70 @@ from utils.sys_utils import (
 
 
 def install_moonraker() -> None:
-    klipper_list: List[Klipper] = get_instances(Klipper)
-
-    if not check_moonraker_install_requirements(klipper_list):
+    if not check_moonraker_install_requirements():
         return
 
-    moonraker_list: List[Moonraker] = get_instances(Moonraker)
-    instances: List[Moonraker] = []
-    selected_option: str | Klipper
+    kl_im = InstanceManager(Klipper)
+    klipper_instances = kl_im.instances
+    mr_im = InstanceManager(Moonraker)
+    moonraker_instances = mr_im.instances
 
-    if len(klipper_list) == 1:
-        instances.append(Moonraker(klipper_list[0].suffix))
-    else:
+    selected_klipper_instance = 0
+    if len(klipper_instances) > 1:
         print_moonraker_overview(
-            klipper_list,
-            moonraker_list,
+            klipper_instances,
+            moonraker_instances,
             show_index=True,
             show_select_all=True,
         )
-        options = {str(i + 1): k for i, k in enumerate(klipper_list)}
-        additional_options = {"a": None, "b": None}
-        options = {**options, **additional_options}
+        options = [str(i) for i in range(len(klipper_instances))]
+        options.extend(["a", "A", "b", "B"])
         question = "Select Klipper instance to setup Moonraker for"
-        selected_option = get_selection_input(question, options)
+        selected_klipper_instance = get_selection_input(question, options).lower()
 
-        if selected_option == "b":
-            Logger.print_status(EXIT_MOONRAKER_SETUP)
-            return
+    instance_names = []
+    if selected_klipper_instance == "b":
+        Logger.print_status(EXIT_MOONRAKER_SETUP)
+        return
 
-        if selected_option == "a":
-            instances.extend([Moonraker(k.suffix) for k in klipper_list])
-        else:
-            klipper_instance: Klipper | None = options.get(selected_option)
-            if klipper_instance is None:
-                raise Exception("Error selecting instance!")
-            instances.append(Moonraker(klipper_instance.suffix))
+    elif selected_klipper_instance == "a":
+        for instance in klipper_instances:
+            instance_names.append(instance.suffix)
+
+    else:
+        index = int(selected_klipper_instance)
+        instance_names.append(klipper_instances[index].suffix)
 
     create_example_cfg = get_confirm("Create example moonraker.conf?")
 
     try:
-        check_install_dependencies()
+        check_install_dependencies(["git"])
         setup_moonraker_prerequesites()
         install_moonraker_polkit()
 
-        used_ports_map = {m.suffix: m.port for m in moonraker_list}
-        for instance in instances:
-            instance.create()
-            cmd_sysctl_service(instance.service_file_path.name, "enable")
+        used_ports_map = {
+            instance.suffix: instance.port for instance in moonraker_instances
+        }
+        for name in instance_names:
+            current_instance = Moonraker(suffix=name)
+
+            mr_im.current_instance = current_instance
+            mr_im.create_instance()
+            mr_im.enable_instance()
 
             if create_example_cfg:
                 # if a webclient and/or it's config is installed, patch
                 # its update section to the config
                 clients = get_existing_clients()
-                create_example_moonraker_conf(instance, used_ports_map, clients)
+                create_example_moonraker_conf(current_instance, used_ports_map, clients)
 
-            cmd_sysctl_service(instance.service_file_path.name, "start")
+            mr_im.start_instance()
 
         cmd_sysctl_manage("daemon-reload")
 
         # if mainsail is installed, and we installed
         # multiple moonraker instances, we enable mainsails remote mode
-        if MainsailData().client_dir.exists() and len(moonraker_list) > 1:
+        if MainsailData().client_dir.exists() and len(mr_im.instances) > 1:
             enable_mainsail_remotemode()
 
     except Exception as e:
@@ -127,9 +123,9 @@ def install_moonraker() -> None:
         return
 
 
-def check_moonraker_install_requirements(klipper_list: List[Klipper]) -> bool:
+def check_moonraker_install_requirements() -> bool:
     def check_klipper_instances() -> bool:
-        if len(klipper_list) >= 1:
+        if len(InstanceManager(Klipper).instances) >= 1:
             return True
 
         Logger.print_warn("Klipper not installed!")
@@ -147,25 +143,26 @@ def setup_moonraker_prerequesites() -> None:
     git_clone_wrapper(repo, MOONRAKER_DIR, branch)
 
     # install moonraker dependencies and create python virtualenv
-    install_moonraker_packages()
-    if create_python_venv(MOONRAKER_ENV_DIR):
-        install_python_requirements(MOONRAKER_ENV_DIR, MOONRAKER_REQ_FILE)
-        install_python_requirements(MOONRAKER_ENV_DIR, MOONRAKER_SPEEDUPS_REQ_FILE)
+    install_moonraker_packages(MOONRAKER_DIR)
+    create_python_venv(MOONRAKER_ENV_DIR)
+    install_python_requirements(MOONRAKER_ENV_DIR, MOONRAKER_REQUIREMENTS_TXT)
 
 
-def install_moonraker_packages() -> None:
+def install_moonraker_packages(moonraker_dir: Path) -> None:
+    install_script = moonraker_dir.joinpath("scripts/install-moonraker.sh")
+    deps_json = MOONRAKER_DIR.joinpath("scripts/system-dependencies.json")
     moonraker_deps = []
 
-    if MOONRAKER_DEPS_JSON_FILE.exists():
-        with open(MOONRAKER_DEPS_JSON_FILE, "r") as deps:
+    if deps_json.exists():
+        with open(deps_json, "r") as deps:
             moonraker_deps = json.load(deps).get("debian", [])
-    elif MOONRAKER_INSTALL_SCRIPT.exists():
-        moonraker_deps = parse_packages_from_file(MOONRAKER_INSTALL_SCRIPT)
+    elif install_script.exists():
+        moonraker_deps = parse_packages_from_file(install_script)
 
     if not moonraker_deps:
         raise ValueError("Error reading Moonraker dependencies!")
 
-    check_install_dependencies({*moonraker_deps})
+    check_install_dependencies(moonraker_deps)
 
 
 def install_moonraker_polkit() -> None:
@@ -206,14 +203,16 @@ def update_moonraker() -> None:
     if settings.kiauh.backup_before_update:
         backup_moonraker_dir()
 
-    instances = get_instances(Moonraker)
-    InstanceManager.stop_all(instances)
+    instance_manager = InstanceManager(Moonraker)
+    instance_manager.stop_all_instance()
 
-    git_pull_wrapper(repo=settings.moonraker.repo_url, target_dir=MOONRAKER_DIR)
+    git_pull_wrapper(
+        repo=settings.moonraker.repo_url, target_dir=MOONRAKER_DIR
+    )
 
     # install possible new system packages
-    install_moonraker_packages()
+    install_moonraker_packages(MOONRAKER_DIR)
     # install possible new python dependencies
-    install_python_requirements(MOONRAKER_ENV_DIR, MOONRAKER_REQ_FILE)
+    install_python_requirements(MOONRAKER_ENV_DIR, MOONRAKER_REQUIREMENTS_TXT)
 
-    InstanceManager.start_all(instances)
+    instance_manager.start_all_instance()

kiauh/components/moonraker/moonraker_utils.py

@@ -11,26 +11,28 @@ import shutil
 from typing import Dict, List, Optional
 
 from components.moonraker import (
+    DEFAULT_MOONRAKER_PORT,
     MODULE_PATH,
     MOONRAKER_BACKUP_DIR,
     MOONRAKER_DB_BACKUP_DIR,
-    MOONRAKER_DEFAULT_PORT,
     MOONRAKER_DIR,
     MOONRAKER_ENV_DIR,
 )
 from components.moonraker.moonraker import Moonraker
 from components.webui_client.base_data import BaseWebClient
+from components.webui_client.client_utils import enable_mainsail_remotemode
+from components.webui_client.mainsail_data import MainsailData
 from core.backup_manager.backup_manager import BackupManager
-from core.logger import Logger
+from core.instance_manager.instance_manager import InstanceManager
 from core.submodules.simple_config_parser.src.simple_config_parser.simple_config_parser import (
     SimpleConfigParser,
 )
-from core.types import ComponentStatus
 from utils.common import get_install_status
-from utils.instance_utils import get_instances
+from utils.logger import Logger
 from utils.sys_utils import (
     get_ipv4_addr,
 )
+from utils.types import ComponentStatus
 
 
 def get_moonraker_status() -> ComponentStatus:
@@ -42,7 +44,7 @@ def create_example_moonraker_conf(
     ports_map: Dict[str, int],
     clients: Optional[List[BaseWebClient]] = None,
 ) -> None:
-    Logger.print_status(f"Creating example moonraker.conf in '{instance.base.cfg_dir}'")
+    Logger.print_status(f"Creating example moonraker.conf in '{instance.cfg_dir}'")
     if instance.cfg_file.is_file():
         Logger.print_info(f"'{instance.cfg_file}' already exists.")
         return
@@ -66,7 +68,7 @@ def create_example_moonraker_conf(
         # of moonraker-1 is 7125 and moonraker-3 is 7127 and there are moonraker.conf files for moonraker-1
         # and moonraker-3 already. though, there does not seem to be a very reliable way of always assigning
         # the correct port to each instance and the user will likely be required to correct the value manually.
-        port = max(ports) + 1 if ports else MOONRAKER_DEFAULT_PORT
+        port = max(ports) + 1 if ports else DEFAULT_MOONRAKER_PORT
     else:
         port = ports_map.get(instance.suffix)
 
@@ -74,7 +76,7 @@ def create_example_moonraker_conf(
 
     ip = get_ipv4_addr().split(".")[:2]
     ip.extend(["0", "0/16"])
-    uds = instance.base.comms_dir.joinpath("klippy.sock")
+    uds = instance.comms_dir.joinpath("klippy.sock")
 
     scp = SimpleConfigParser()
     scp.read(target)
@@ -123,10 +125,62 @@ def create_example_moonraker_conf(
                     scp.set(c_config_section, option[0], option[1])
 
     scp.write(target)
-    Logger.print_ok(f"Example moonraker.conf created in '{instance.base.cfg_dir}'")
+    Logger.print_ok(f"Example moonraker.conf created in '{instance.cfg_dir}'")
 
 
-def backup_moonraker_dir() -> None:
+def moonraker_to_multi_conversion(new_name: str) -> None:
+    """
+    Converts the first instance in the List of Moonraker instances to an instance
+    with a new name. This method will be called when converting from a single Klipper
+    instance install to a multi instance install when Moonraker is also already
+    installed with a single instance.
+    :param new_name: new name the previous single instance is renamed to
+    :return: None
+    """
+    im = InstanceManager(Moonraker)
+    instances: List[Moonraker] = im.instances
+    if not instances:
+        return
+
+    # in case there are multiple Moonraker instances, we don't want to do anything
+    if len(instances) > 1:
+        Logger.print_info("More than a single Moonraker instance found. Skipped ...")
+        return
+
+    Logger.print_status("Convert Moonraker single to multi instance ...")
+
+    # remove the old single instance
+    im.current_instance = im.instances[0]
+    im.stop_instance()
+    im.disable_instance()
+    im.delete_instance()
+
+    # create a new moonraker instance with the new name
+    new_instance = Moonraker(suffix=new_name)
+    im.current_instance = new_instance
+
+    # patch the server sections klippy_uds_address value to match the new printer_data foldername
+    scp = SimpleConfigParser()
+    scp.read(new_instance.cfg_file)
+    if scp.has_section("server"):
+        scp.set(
+            "server",
+            "klippy_uds_address",
+            str(new_instance.comms_dir.joinpath("klippy.sock")),
+        )
+        scp.write(new_instance.cfg_file)
+
+    # create, enable and start the new moonraker instance
+    im.create_instance()
+    im.enable_instance()
+    im.start_instance()
+
+    # if mainsail is installed, we enable mainsails remote mode
+    if MainsailData().client_dir.exists() and len(im.instances) > 1:
+        enable_mainsail_remotemode()
+
+
+def backup_moonraker_dir():
     bm = BackupManager()
     bm.backup_directory("moonraker", source=MOONRAKER_DIR, target=MOONRAKER_BACKUP_DIR)
     bm.backup_directory(
@@ -135,11 +189,12 @@ def backup_moonraker_dir() -> None:
 
 
 def backup_moonraker_db_dir() -> None:
-    instances: List[Moonraker] = get_instances(Moonraker)
+    im = InstanceManager(Moonraker)
+    instances: List[Moonraker] = im.instances
     bm = BackupManager()
 
     for instance in instances:
-        name = f"database-{instance.data_dir.name}"
+        name = f"database-{instance.data_dir_name}"
         bm.backup_directory(
             name, source=instance.db_dir, target=MOONRAKER_DB_BACKUP_DIR
         )

kiauh/components/octoeverywhere/__init__.py

@@ -1,29 +0,0 @@
-# ======================================================================= #
-#  Copyright (C) 2020 - 2024 Dominik Willner <th33xitus@gmail.com>        #
-#                                                                         #
-#  This file is part of KIAUH - Klipper Installation And Update Helper    #
-#  https://github.com/dw-0/kiauh                                          #
-#                                                                         #
-#  This file may be distributed under the terms of the GNU GPLv3 license  #
-# ======================================================================= #
-from pathlib import Path
-
-# repo
-OE_REPO = "https://github.com/QuinnDamerell/OctoPrint-OctoEverywhere.git"
-
-# directories
-OE_DIR = Path.home().joinpath("octoeverywhere")
-OE_ENV_DIR = Path.home().joinpath("octoeverywhere-env")
-OE_STORE_DIR = OE_DIR.joinpath("octoeverywhere-store")
-
-# files
-OE_REQ_FILE = OE_DIR.joinpath("requirements.txt")
-OE_DEPS_JSON_FILE = OE_DIR.joinpath("moonraker-system-dependencies.json")
-OE_INSTALL_SCRIPT = OE_DIR.joinpath("install.sh")
-OE_UPDATE_SCRIPT = OE_DIR.joinpath("update.sh")
-OE_INSTALLER_LOG_FILE = Path.home().joinpath("octoeverywhere-installer.log")
-
-# filenames
-OE_CFG_NAME = "octoeverywhere.conf"
-OE_LOG_NAME = "octoeverywhere.log"
-OE_SYS_CFG_NAME = "octoeverywhere-system.cfg"

kiauh/components/octoeverywhere/octoeverywhere.py

@@ -1,75 +0,0 @@
-# ======================================================================= #
-#  Copyright (C) 2020 - 2024 Dominik Willner <th33xitus@gmail.com>        #
-#                                                                         #
-#  This file is part of KIAUH - Klipper Installation And Update Helper    #
-#  https://github.com/dw-0/kiauh                                          #
-#                                                                         #
-#  This file may be distributed under the terms of the GNU GPLv3 license  #
-# ======================================================================= #
-from __future__ import annotations
-
-from dataclasses import dataclass, field
-from pathlib import Path
-from subprocess import CalledProcessError, run
-
-from components.moonraker import MOONRAKER_CFG_NAME
-from components.moonraker.moonraker import Moonraker
-from components.octoeverywhere import (
-    OE_CFG_NAME,
-    OE_DIR,
-    OE_ENV_DIR,
-    OE_INSTALL_SCRIPT,
-    OE_LOG_NAME,
-    OE_SYS_CFG_NAME,
-    OE_UPDATE_SCRIPT,
-)
-from core.instance_manager.base_instance import BaseInstance
-from core.logger import Logger
-from utils.sys_utils import get_service_file_path
-
-
-@dataclass
-class Octoeverywhere:
-    suffix: str
-    base: BaseInstance = field(init=False, repr=False)
-    service_file_path: Path = field(init=False)
-    log_file_name = OE_LOG_NAME
-    dir: Path = OE_DIR
-    env_dir: Path = OE_ENV_DIR
-    data_dir: Path = field(init=False)
-    store_dir: Path = field(init=False)
-    cfg_file: Path = field(init=False)
-    sys_cfg_file: Path = field(init=False)
-
-    def __post_init__(self):
-        self.base: BaseInstance = BaseInstance(Moonraker, self.suffix)
-        self.base.log_file_name = self.log_file_name
-
-        self.service_file_path: Path = get_service_file_path(
-            Octoeverywhere, self.suffix
-        )
-        self.store_dir = self.base.data_dir.joinpath("store")
-        self.cfg_file = self.base.cfg_dir.joinpath(OE_CFG_NAME)
-        self.sys_cfg_file = self.base.cfg_dir.joinpath(OE_SYS_CFG_NAME)
-        self.data_dir = self.base.data_dir
-        self.sys_cfg_file = self.base.cfg_dir.joinpath(OE_SYS_CFG_NAME)
-
-    def create(self) -> None:
-        Logger.print_status("Creating OctoEverywhere for Klipper Instance ...")
-
-        try:
-            cmd = f"{OE_INSTALL_SCRIPT} {self.base.cfg_dir}/{MOONRAKER_CFG_NAME}"
-            run(cmd, check=True, shell=True)
-
-        except CalledProcessError as e:
-            Logger.print_error(f"Error creating instance: {e}")
-            raise
-
-    @staticmethod
-    def update() -> None:
-        try:
-            run(OE_UPDATE_SCRIPT.as_posix(), check=True, shell=True, cwd=OE_DIR)
-
-        except CalledProcessError as e:
-            Logger.print_error(f"Error updating OctoEverywhere for Klipper: {e}")
-            raise

kiauh/components/octoeverywhere/octoeverywhere_setup.py

@@ -1,197 +0,0 @@
-# ======================================================================= #
-#  Copyright (C) 2020 - 2024 Dominik Willner <th33xitus@gmail.com>        #
-#                                                                         #
-#  This file is part of KIAUH - Klipper Installation And Update Helper    #
-#  https://github.com/dw-0/kiauh                                          #
-#                                                                         #
-#  This file may be distributed under the terms of the GNU GPLv3 license  #
-# ======================================================================= #
-import json
-from typing import List
-
-from components.moonraker.moonraker import Moonraker
-from components.octoeverywhere import (
-    OE_DEPS_JSON_FILE,
-    OE_DIR,
-    OE_ENV_DIR,
-    OE_INSTALL_SCRIPT,
-    OE_INSTALLER_LOG_FILE,
-    OE_REPO,
-    OE_REQ_FILE,
-    OE_SYS_CFG_NAME,
-)
-from components.octoeverywhere.octoeverywhere import Octoeverywhere
-from core.instance_manager.instance_manager import InstanceManager
-from core.logger import DialogType, Logger
-from core.types import ComponentStatus
-from utils.common import (
-    check_install_dependencies,
-    get_install_status,
-    moonraker_exists,
-)
-from utils.config_utils import (
-    remove_config_section,
-)
-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.instance_utils import get_instances
-from utils.sys_utils import (
-    install_python_requirements,
-    parse_packages_from_file,
-)
-
-
-def get_octoeverywhere_status() -> ComponentStatus:
-    return get_install_status(OE_DIR, OE_ENV_DIR, Octoeverywhere)
-
-
-def install_octoeverywhere() -> None:
-    Logger.print_status("Installing OctoEverywhere for Klipper ...")
-
-    # check if moonraker is installed. if not, notify the user and exit
-    if not moonraker_exists():
-        return
-
-    force_clone = False
-    oe_instances: List[Octoeverywhere] = get_instances(Octoeverywhere)
-    if oe_instances:
-        Logger.print_dialog(
-            DialogType.INFO,
-            [
-                "OctoEverywhere is already installed!",
-                "It is safe to run the installer again to link your "
-                "printer or repair any issues.",
-            ],
-        )
-        if not get_confirm("Re-run OctoEverywhere installation?"):
-            Logger.print_info("Exiting OctoEverywhere for Klipper installation ...")
-            return
-        else:
-            Logger.print_status("Re-Installing OctoEverywhere for Klipper ...")
-            force_clone = True
-
-    mr_instances: List[Moonraker] = get_instances(Moonraker)
-
-    mr_names = [f"● {moonraker.data_dir.name}" for moonraker in mr_instances]
-    if len(mr_names) > 1:
-        Logger.print_dialog(
-            DialogType.INFO,
-            [
-                "The following Moonraker instances were found:",
-                *mr_names,
-                "\n\n",
-                "The setup will apply the same names to OctoEverywhere!",
-            ],
-        )
-
-    if not get_confirm(
-        "Continue OctoEverywhere for Klipper installation?",
-        default_choice=True,
-        allow_go_back=True,
-    ):
-        Logger.print_info("Exiting OctoEverywhere for Klipper installation ...")
-        return
-
-    try:
-        git_clone_wrapper(OE_REPO, OE_DIR, force=force_clone)
-
-        for moonraker in mr_instances:
-            instance = Octoeverywhere(suffix=moonraker.suffix)
-            instance.create()
-
-        InstanceManager.restart_all(mr_instances)
-
-        Logger.print_dialog(
-            DialogType.SUCCESS,
-            ["OctoEverywhere for Klipper successfully installed!"],
-            center_content=True,
-        )
-
-    except Exception as e:
-        Logger.print_error(
-            f"Error during OctoEverywhere for Klipper installation:\n{e}"
-        )
-
-
-def update_octoeverywhere() -> None:
-    Logger.print_status("Updating OctoEverywhere for Klipper ...")
-    try:
-        Octoeverywhere.update()
-        Logger.print_dialog(
-            DialogType.SUCCESS,
-            ["OctoEverywhere for Klipper successfully updated!"],
-            center_content=True,
-        )
-
-    except Exception as e:
-        Logger.print_error(f"Error during OctoEverywhere for Klipper update:\n{e}")
-
-
-def remove_octoeverywhere() -> None:
-    Logger.print_status("Removing OctoEverywhere for Klipper ...")
-
-    mr_instances: List[Moonraker] = get_instances(Moonraker)
-    ob_instances: List[Octoeverywhere] = get_instances(Octoeverywhere)
-
-    try:
-        remove_oe_instances(ob_instances)
-        remove_oe_dir()
-        remove_oe_env()
-        remove_config_section(f"include {OE_SYS_CFG_NAME}", mr_instances)
-        run_remove_routines(OE_INSTALLER_LOG_FILE)
-        Logger.print_dialog(
-            DialogType.SUCCESS,
-            ["OctoEverywhere for Klipper successfully removed!"],
-            center_content=True,
-        )
-
-    except Exception as e:
-        Logger.print_error(f"Error during OctoEverywhere for Klipper removal:\n{e}")
-
-
-def install_oe_dependencies() -> None:
-    oe_deps = []
-    if OE_DEPS_JSON_FILE.exists():
-        with open(OE_DEPS_JSON_FILE, "r") as deps:
-            oe_deps = json.load(deps).get("debian", [])
-    elif OE_INSTALL_SCRIPT.exists():
-        oe_deps = parse_packages_from_file(OE_INSTALL_SCRIPT)
-
-    if not oe_deps:
-        raise ValueError("Error reading OctoEverywhere dependencies!")
-
-    check_install_dependencies({*oe_deps})
-    install_python_requirements(OE_ENV_DIR, OE_REQ_FILE)
-
-
-def remove_oe_instances(
-    instance_list: List[Octoeverywhere],
-) -> None:
-    if not instance_list:
-        Logger.print_info("No OctoEverywhere instances found. Skipped ...")
-        return
-
-    for instance in instance_list:
-        Logger.print_status(f"Removing instance {instance.service_file_path.stem} ...")
-        InstanceManager.remove(instance)
-
-
-def remove_oe_dir() -> None:
-    Logger.print_status("Removing OctoEverywhere for Klipper directory ...")
-
-    if not OE_DIR.exists():
-        Logger.print_info(f"'{OE_DIR}' does not exist. Skipped ...")
-        return
-
-    run_remove_routines(OE_DIR)
-
-
-def remove_oe_env() -> None:
-    Logger.print_status("Removing OctoEverywhere for Klipper environment ...")
-
-    if not OE_ENV_DIR.exists():
-        Logger.print_info(f"'{OE_ENV_DIR}' does not exist. Skipped ...")
-        return
-
-    run_remove_routines(OE_ENV_DIR)

kiauh/components/webui_client/base_data.py

@@ -9,8 +9,7 @@
 
 from __future__ import annotations
 
-from abc import ABC
-from dataclasses import dataclass
+from abc import ABC, abstractmethod
 from enum import Enum
 from pathlib import Path
 
@@ -25,32 +24,89 @@ class WebClientConfigType(Enum):
     FLUIDD: str = "fluidd-config"
 
 
-@dataclass()
 class BaseWebClient(ABC):
     """Base class for webclient data"""
 
-    client: WebClientType
-    name: str
-    display_name: str
-    client_dir: Path
-    config_file: Path
-    backup_dir: Path
-    repo_path: str
-    download_url: str
-    nginx_access_log: Path
-    nginx_error_log: Path
-    client_config: BaseWebClientConfig
+    @property
+    @abstractmethod
+    def client(self) -> WebClientType:
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def name(self) -> str:
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def display_name(self) -> str:
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def client_dir(self) -> Path:
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def backup_dir(self) -> Path:
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def repo_path(self) -> str:
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def download_url(self) -> str:
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def client_config(self) -> BaseWebClientConfig:
+        raise NotImplementedError
 
 
-@dataclass()
 class BaseWebClientConfig(ABC):
     """Base class for webclient config data"""
 
-    client_config: WebClientConfigType
-    name: str
-    display_name: str
-    config_filename: str
-    config_dir: Path
-    backup_dir: Path
-    repo_url: str
-    config_section: str
+    @property
+    @abstractmethod
+    def client_config(self) -> WebClientConfigType:
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def name(self) -> str:
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def display_name(self) -> str:
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def config_filename(self) -> str:
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def config_dir(self) -> Path:
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def backup_dir(self) -> Path:
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def repo_url(self) -> str:
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def config_section(self) -> str:
+        raise NotImplementedError

kiauh/components/webui_client/client_config/client_config_remove.py

@@ -8,15 +8,17 @@
 # ======================================================================= #
 
 
+import shutil
+import subprocess
 from typing import List
 
 from components.klipper.klipper import Klipper
 from components.moonraker.moonraker import Moonraker
 from components.webui_client.base_data import BaseWebClientConfig
-from core.logger import Logger
+from core.instance_manager.instance_manager import InstanceManager
 from utils.config_utils import remove_config_section
-from utils.fs_utils import run_remove_routines
-from utils.instance_utils import get_instances
+from utils.fs_utils import remove_file
+from utils.logger import Logger
 
 
 def run_client_config_removal(
@@ -31,13 +33,29 @@ def run_client_config_removal(
 
 
 def remove_client_config_dir(client_config: BaseWebClientConfig) -> None:
-    Logger.print_status(f"Removing {client_config.display_name} ...")
-    run_remove_routines(client_config.config_dir)
+    Logger.print_status(f"Removing {client_config.name} ...")
+    client_config_dir = client_config.config_dir
+    if not client_config_dir.exists():
+        Logger.print_info(f"'{client_config_dir}' does not exist. Skipping ...")
+        return
+
+    try:
+        shutil.rmtree(client_config_dir)
+    except OSError as e:
+        Logger.print_error(f"Unable to delete '{client_config_dir}':\n{e}")
 
 
 def remove_client_config_symlink(client_config: BaseWebClientConfig) -> None:
-    instances: List[Klipper] = get_instances(Klipper)
+    im = InstanceManager(Klipper)
+    instances: List[Klipper] = im.instances
     for instance in instances:
-        run_remove_routines(
-            instance.base.cfg_dir.joinpath(client_config.config_filename)
-        )
+        Logger.print_status(f"Removing symlink from '{instance.cfg_dir}' ...")
+        symlink = instance.cfg_dir.joinpath(client_config.config_filename)
+        if not symlink.is_symlink():
+            Logger.print_info(f"'{symlink}' does not exist. Skipping ...")
+            continue
+
+        try:
+            remove_file(symlink)
+        except subprocess.CalledProcessError:
+            Logger.print_error("Failed to remove symlink!")

kiauh/components/webui_client/client_config/client_config_setup.py

@@ -6,7 +6,6 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import shutil
 import subprocess
@@ -21,24 +20,23 @@ from components.webui_client.client_dialogs import (
 )
 from components.webui_client.client_utils import (
     backup_client_config_data,
-    detect_client_cfg_conflict,
+    config_for_other_client_exist,
 )
 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.instance_utils import get_instances
+from utils.logger import Logger
 
 
 def install_client_config(client_data: BaseWebClient) -> None:
     client_config: BaseWebClientConfig = client_data.client_config
     display_name = client_config.display_name
 
-    if detect_client_cfg_conflict(client_data):
+    if config_for_other_client_exist(client_data.client):
         Logger.print_info("Another Client-Config is already installed! Skipped ...")
         return
 
@@ -49,8 +47,10 @@ def install_client_config(client_data: BaseWebClient) -> None:
         else:
             return
 
-    mr_instances: List[Moonraker] = get_instances(Moonraker)
-    kl_instances = get_instances(Klipper)
+    mr_im = InstanceManager(Moonraker)
+    mr_instances: List[Moonraker] = mr_im.instances
+    kl_im = InstanceManager(Klipper)
+    kl_instances = kl_im.instances
 
     try:
         download_client_config(client_config)
@@ -70,7 +70,7 @@ def install_client_config(client_data: BaseWebClient) -> None:
             ],
         )
         add_config_section_at_top(client_config.config_section, kl_instances)
-        InstanceManager.restart_all(kl_instances)
+        kl_im.restart_all_instance()
 
     except Exception as e:
         Logger.print_error(f"{display_name} installation failed!\n{e}")
@@ -112,12 +112,16 @@ def update_client_config(client: BaseWebClient) -> None:
 
 
 def create_client_config_symlink(
-    client_config: BaseWebClientConfig, klipper_instances: List[Klipper]
+    client_config: BaseWebClientConfig, klipper_instances: List[Klipper] = None
 ) -> None:
+    if klipper_instances is None:
+        kl_im = InstanceManager(Klipper)
+        klipper_instances = kl_im.instances
+
+    Logger.print_status(f"Create symlink for {client_config.config_filename} ...")
+    source = Path(client_config.config_dir, client_config.config_filename)
     for instance in klipper_instances:
-        Logger.print_status(f"Create symlink for {client_config.config_filename} ...")
-        source = Path(client_config.config_dir, client_config.config_filename)
-        target = instance.base.cfg_dir
+        target = instance.cfg_dir
         Logger.print_status(f"Linking {source} to {target}")
         try:
             create_symlink(source, target)

kiauh/components/webui_client/client_dialogs.py

@@ -7,82 +7,102 @@
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
 
+import textwrap
 from typing import List
 
 from components.webui_client.base_data import BaseWebClient
-from core.logger import DialogType, Logger
+from core.menus.base_menu import print_back_footer
+from utils.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 
 
-def print_moonraker_not_found_dialog() -> None:
-    Logger.print_dialog(
-        DialogType.WARNING,
-        [
-            "No local Moonraker installation was found!",
-            "\n\n",
-            "It is possible to install Mainsail without a local Moonraker installation. "
-            "If you continue, you need to make sure, that Moonraker is installed on "
-            "another machine in your network. Otherwise Mainsail will NOT work "
-            "correctly.",
-        ],
-    )
+def print_moonraker_not_found_dialog():
+    line1 = f"{COLOR_YELLOW}WARNING:{RESET_FORMAT}"
+    line2 = f"{COLOR_YELLOW}No local Moonraker installation was found!{RESET_FORMAT}"
+    dialog = textwrap.dedent(
+        f"""
+        /=======================================================\\
+        | {line1:<63}|
+        | {line2:<63}|
+        |-------------------------------------------------------|
+        | It is possible to install Mainsail without a local    |
+        | Moonraker installation. If you continue, you need to  |
+        | make sure, that Moonraker is installed on another     |
+        | machine in your network. Otherwise Mainsail will NOT  |
+        | work correctly.                                       |
+        """
+    )[1:]
+
+    print(dialog, end="")
+    print_back_footer()
 
 
-def print_client_already_installed_dialog(name: str) -> None:
-    Logger.print_dialog(
-        DialogType.WARNING,
-        [
-            f"{name} seems to be already installed!",
-            f"If you continue, your current {name} installation will be overwritten.",
-        ],
-    )
+def print_client_already_installed_dialog(name: str):
+    line1 = f"{COLOR_YELLOW}WARNING:{RESET_FORMAT}"
+    line2 = f"{COLOR_YELLOW}{name} seems to be already installed!{RESET_FORMAT}"
+    line3 = f"If you continue, your current {name}"
+    dialog = textwrap.dedent(
+        f"""
+        /=======================================================\\
+        | {line1:<63}|
+        | {line2:<63}|
+        |-------------------------------------------------------|
+        | {line3:<54}|
+        | installation will be overwritten.                     |
+        """
+    )[1:]
+
+    print(dialog, end="")
+    print_back_footer()
 
 
-def print_client_port_select_dialog(
-    name: str, port: int, ports_in_use: List[int]
-) -> None:
-    Logger.print_dialog(
-        DialogType.CUSTOM,
-        [
-            f"Please select the port, {name} should be served on. If your are unsure "
-            f"what to select, hit Enter to apply the suggested value of: {port}",
-            "\n\n",
-            f"In case you need {name} to be served on a specific port, you can set it "
-            f"now. Make sure that the port is not already used by another application "
-            f"on your system!",
-            "\n\n",
-            "The following ports were found to be in use already:",
-            *[f"● {port}" for port in ports_in_use],
-        ],
-    )
+def print_client_port_select_dialog(name: str, port: int, ports_in_use: List[int]):
+    port = f"{COLOR_CYAN}{port}{RESET_FORMAT}"
+    line1 = f"Please select the port, {name} should be served on."
+    line2 = f"In case you need {name} to be served on a specific"
+    dialog = textwrap.dedent(
+        f"""
+        /=======================================================\\
+        | {line1:<54}|
+        | If you are unsure what to select, hit Enter to apply  |
+        | the suggested value of: {port:38} |
+        |                                                       |
+        | {line2:<54}|
+        | port, you can set it now. Make sure the port is not   |
+        | used by any other application on your system!         |
+        """
+    )[1:]
+
+    if len(ports_in_use) > 0:
+        dialog += "|-------------------------------------------------------|\n"
+        dialog += "| The following ports were found to be in use already:  |\n"
+        for port in ports_in_use:
+            port = f"{COLOR_CYAN}● {port}{RESET_FORMAT}"
+            dialog += f"|  {port:60}  |\n"
+
+    dialog += "\\=======================================================/\n"
+
+    print(dialog, end="")
 
 
-def print_install_client_config_dialog(client: BaseWebClient) -> None:
+def print_install_client_config_dialog(client: BaseWebClient):
     name = client.display_name
     url = client.client_config.repo_url.replace(".git", "")
-    Logger.print_dialog(
-        DialogType.INFO,
-        [
-            f"It is recommended to use special macros in order to have {name} fully "
-            f"functional and working.",
-            "\n\n",
-            f"The recommended macros for {name} can be seen here:",
-            url,
-            "\n\n",
-            "If you already use these macros skip this step. Otherwise you should "
-            "consider to answer with 'Y' to download the recommended macros.",
-        ],
-    )
+    line1 = f"have {name} fully functional and working."
+    line2 = f"The recommended macros for {name} can be seen here:"
+    dialog = textwrap.dedent(
+        f"""
+        /=======================================================\\
+        | It is recommended to use special macros in order to   |
+        | {line1:<54}|
+        |                                                       |
+        | {line2:<54}|
+        | {url:<54}|
+        |                                                       |
+        | If you already use these macros skip this step.       |
+        | Otherwise you should consider to answer with 'Y' to   |
+        | download the recommended macros.                      |
+        \\=======================================================/
+        """
+    )[1:]
 
-
-def print_ipv6_warning_dialog() -> None:
-    Logger.print_dialog(
-        DialogType.WARNING,
-        [
-            "It looks like IPv6 is enabled on this system!",
-            "This may cause issues with the installation of NGINX in the following "
-            "steps! It is recommended to disable IPv6 on your system to avoid this issue.",
-            "\n\n",
-            "If you think this warning is a false alarm, and you are sure that "
-            "IPv6 is disabled, you can continue with the installation.",
-        ],
-    )
+    print(dialog, end="")

kiauh/components/webui_client/client_remove.py

@@ -6,50 +6,54 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
+
+
+import shutil
 from typing import List
 
 from components.klipper.klipper import Klipper
 from components.moonraker.moonraker import Moonraker
 from components.webui_client.base_data import (
     BaseWebClient,
+    WebClientType,
 )
 from components.webui_client.client_config.client_config_remove import (
     run_client_config_removal,
 )
-from core.backup_manager.backup_manager import BackupManager
-from core.constants import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED
-from core.logger import Logger
+from components.webui_client.client_utils import backup_mainsail_config_json
+from core.instance_manager.instance_manager import InstanceManager
 from utils.config_utils import remove_config_section
 from utils.fs_utils import (
-    remove_with_sudo,
-    run_remove_routines,
+    remove_nginx_config,
+    remove_nginx_logs,
 )
-from utils.instance_utils import get_instances
+from utils.logger import Logger
 
 
 def run_client_removal(
     client: BaseWebClient,
-    remove_client: bool,
-    remove_client_cfg: bool,
-    backup_config: bool,
+    rm_client: bool,
+    rm_client_config: bool,
+    backup_ms_config_json: bool,
 ) -> None:
-    mr_instances: List[Moonraker] = get_instances(Moonraker)
-    kl_instances: List[Klipper] = get_instances(Klipper)
+    mr_im = InstanceManager(Moonraker)
+    mr_instances: List[Moonraker] = mr_im.instances
+    kl_im = InstanceManager(Klipper)
+    kl_instances: List[Klipper] = kl_im.instances
 
-    if backup_config:
-        bm = BackupManager()
-        bm.backup_file(client.config_file)
+    if backup_ms_config_json and client.client == WebClientType.MAINSAIL:
+        backup_mainsail_config_json()
 
-    if remove_client:
+    if rm_client:
         client_name = client.name
         remove_client_dir(client)
-        remove_client_nginx_config(client_name)
-        remove_client_nginx_logs(client, kl_instances)
+        remove_nginx_config(client_name)
+        remove_nginx_logs(client_name, kl_instances)
 
         section = f"update_manager {client_name}"
         remove_config_section(section, mr_instances)
 
-    if remove_client_cfg:
+    if rm_client_config:
         run_client_config_removal(
             client.client_config,
             kl_instances,
@@ -59,27 +63,12 @@ def run_client_removal(
 
 def remove_client_dir(client: BaseWebClient) -> None:
     Logger.print_status(f"Removing {client.display_name} ...")
-    run_remove_routines(client.client_dir)
-
-
-def remove_client_nginx_config(name: str) -> None:
-    Logger.print_status(f"Removing NGINX config for {name.capitalize()} ...")
-
-    remove_with_sudo(NGINX_SITES_AVAILABLE.joinpath(name))
-    remove_with_sudo(NGINX_SITES_ENABLED.joinpath(name))
-
-
-def remove_client_nginx_logs(client: BaseWebClient, instances: List[Klipper]) -> None:
-    Logger.print_status(f"Removing NGINX logs for {client.display_name} ...")
-
-    remove_with_sudo(client.nginx_access_log)
-    remove_with_sudo(client.nginx_error_log)
-
-    if not instances:
+    client_dir = client.client_dir
+    if not client.client_dir.exists():
+        Logger.print_info(f"'{client_dir}' does not exist. Skipping ...")
         return
 
-    for instance in instances:
-        run_remove_routines(
-            instance.base.log_dir.joinpath(client.nginx_access_log.name)
-        )
-        run_remove_routines(instance.base.log_dir.joinpath(client.nginx_error_log.name))
+    try:
+        shutil.rmtree(client_dir)
+    except OSError as e:
+        Logger.print_error(f"Unable to delete '{client_dir}':\n{e}")

kiauh/components/webui_client/client_setup.py

@@ -6,8 +6,7 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-import shutil
-import tempfile
+
 from pathlib import Path
 from typing import List
 
@@ -28,24 +27,27 @@ from components.webui_client.client_dialogs import (
     print_moonraker_not_found_dialog,
 )
 from components.webui_client.client_utils import (
-    copy_common_vars_nginx_cfg,
-    copy_upstream_nginx_cfg,
-    create_nginx_cfg,
-    detect_client_cfg_conflict,
+    backup_mainsail_config_json,
+    config_for_other_client_exist,
     enable_mainsail_remotemode,
-    get_next_free_port,
-    is_valid_port,
-    read_ports_from_nginx_configs,
+    restore_mainsail_config_json,
     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
-from utils.fs_utils import unzip
+from utils.fs_utils import (
+    copy_common_vars_nginx_cfg,
+    copy_upstream_nginx_cfg,
+    create_nginx_cfg,
+    get_next_free_port,
+    is_valid_port,
+    read_ports_from_nginx_configs,
+    unzip,
+)
 from utils.input_utils import get_confirm, get_number_input
-from utils.instance_utils import get_instances
+from utils.logger import Logger
 from utils.sys_utils import (
     cmd_sysctl_service,
     download_file,
@@ -63,12 +65,16 @@ def install_client(client: BaseWebClient) -> None:
         )
         return
 
-    mr_instances: List[Moonraker] = get_instances(Moonraker)
+    mr_im = InstanceManager(Moonraker)
+    mr_instances: List[Moonraker] = mr_im.instances
 
     enable_remotemode = False
     if not mr_instances:
         print_moonraker_not_found_dialog()
-        if not get_confirm(f"Continue {client.display_name} installation?"):
+        if not get_confirm(
+            f"Continue {client.display_name} installation?",
+            allow_go_back=True,
+        ):
             return
 
     # if moonraker is not installed or multiple instances
@@ -80,13 +86,14 @@ def install_client(client: BaseWebClient) -> None:
     ):
         enable_remotemode = True
 
-    kl_instances = get_instances(Klipper)
+    kl_im = InstanceManager(Klipper)
+    kl_instances = kl_im.instances
     install_client_cfg = False
     client_config: BaseWebClientConfig = client.client_config
     if (
         kl_instances
         and not client_config.config_dir.exists()
-        and not detect_client_cfg_conflict(client)
+        and not config_for_other_client_exist(client_to_ignore=client.client)
     ):
         print_install_client_config_dialog(client)
         question = f"Download the recommended {client_config.display_name}?"
@@ -108,7 +115,7 @@ def install_client(client: BaseWebClient) -> None:
         )
         valid_port = is_valid_port(port, ports_in_use)
 
-    check_install_dependencies({"nginx"})
+    check_install_dependencies(["nginx", "unzip"])
 
     try:
         download_client(client)
@@ -125,7 +132,7 @@ def install_client(client: BaseWebClient) -> None:
                     ("path", str(client.client_dir)),
                 ],
             )
-            InstanceManager.restart_all(mr_instances)
+            mr_im.restart_all_instance()
         if install_client_cfg and kl_instances:
             install_client_config(client)
 
@@ -141,7 +148,7 @@ def install_client(client: BaseWebClient) -> None:
         )
 
         if kl_instances:
-            symlink_webui_nginx_log(client, kl_instances)
+            symlink_webui_nginx_log(kl_instances)
         cmd_sysctl_service("nginx", "restart")
 
     except Exception as e:
@@ -181,10 +188,10 @@ def update_client(client: BaseWebClient) -> None:
         )
         return
 
-    with tempfile.NamedTemporaryFile(suffix=".json") as tmp_file:
-        Logger.print_status(
-            f"Creating temporary backup of {client.config_file} as {tmp_file.name} ..."
-        )
-        shutil.copy(client.config_file, tmp_file.name)
-        download_client(client)
-        shutil.copy(tmp_file.name, client.config_file)
+    if client.client == WebClientType.MAINSAIL:
+        backup_mainsail_config_json(is_temp=True)
+
+    download_client(client)
+
+    if client.client == WebClientType.MAINSAIL:
+        restore_mainsail_config_json()

kiauh/components/webui_client/client_utils.py

@@ -6,41 +6,30 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
-import json
-import re
+import json  # noqa: I001
 import shutil
 from pathlib import Path
-from subprocess import PIPE, CalledProcessError, run
 from typing import List, get_args
 
 from components.klipper.klipper import Klipper
-from components.webui_client import MODULE_PATH
 from components.webui_client.base_data import (
     BaseWebClient,
+    BaseWebClientConfig,
     WebClientType,
 )
-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,
-    NGINX_CONFD,
-    NGINX_SITES_AVAILABLE,
-    NGINX_SITES_ENABLED,
-    RESET_FORMAT,
-)
-from core.logger import Logger
 from core.settings.kiauh_settings import KiauhSettings
-from core.types import ComponentStatus
+from utils import NGINX_CONFD, NGINX_SITES_AVAILABLE
 from utils.common import get_install_status
-from utils.fs_utils import create_symlink, remove_file
+from utils.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 from utils.git_utils import (
-    get_latest_remote_tag,
+    get_latest_tag,
     get_latest_unstable_tag,
 )
+from utils.logger import Logger
+from utils.types import ComponentStatus, InstallStatus
 
 
 def get_client_status(
@@ -51,16 +40,16 @@ def get_client_status(
         NGINX_CONFD.joinpath("upstreams.conf"),
         NGINX_CONFD.joinpath("common_vars.conf"),
     ]
-    comp_status: ComponentStatus = get_install_status(client.client_dir, files=files)
+    status = get_install_status(client.client_dir, files=files)
 
     # if the client dir does not exist, set the status to not
     # installed even if the other files are present
     if not client.client_dir.exists():
-        comp_status.status = 0
+        status["status"] = InstallStatus.NOT_INSTALLED
 
-    comp_status.local = get_local_client_version(client)
-    comp_status.remote = get_remote_client_version(client) if fetch_remote else None
-    return comp_status
+    status["local"] = get_local_client_version(client)
+    status["remote"] = get_remote_client_version(client) if fetch_remote else None
+    return status
 
 
 def get_client_config_status(client: BaseWebClient) -> ComponentStatus:
@@ -83,6 +72,27 @@ def get_current_client_config(clients: List[BaseWebClient]) -> str:
     return f"{COLOR_CYAN}-{RESET_FORMAT}"
 
 
+def backup_mainsail_config_json(is_temp=False) -> None:
+    c_json = MainsailData().client_dir.joinpath("config.json")
+    Logger.print_status(f"Backup '{c_json}' ...")
+    bm = BackupManager()
+    if is_temp:
+        fn = Path.home().joinpath("config.json.kiauh.bak")
+        bm.backup_file(c_json, custom_filename=fn)
+    else:
+        bm.backup_file(c_json)
+
+
+def restore_mainsail_config_json() -> None:
+    try:
+        c_json = MainsailData().client_dir.joinpath("config.json")
+        Logger.print_status(f"Restore '{c_json}' ...")
+        source = Path.home().joinpath("config.json.kiauh.bak")
+        shutil.copy(source, c_json)
+    except OSError:
+        Logger.print_info("Unable to restore config.json. Skipped ...")
+
+
 def enable_mainsail_remotemode() -> None:
     Logger.print_status("Enable Mainsails remote mode ...")
     c_json = MainsailData().client_dir.joinpath("config.json")
@@ -101,47 +111,45 @@ def enable_mainsail_remotemode() -> None:
     Logger.print_ok("Mainsails remote mode enabled!")
 
 
-def symlink_webui_nginx_log(
-    client: BaseWebClient, klipper_instances: List[Klipper]
-) -> None:
+def symlink_webui_nginx_log(klipper_instances: List[Klipper]) -> None:
     Logger.print_status("Link NGINX logs into log directory ...")
-    access_log = client.nginx_access_log
-    error_log = client.nginx_error_log
+    access_log = Path("/var/log/nginx/mainsail-access.log")
+    error_log = Path("/var/log/nginx/mainsail-error.log")
 
     for instance in klipper_instances:
-        desti_access = instance.base.log_dir.joinpath(access_log.name)
+        desti_access = instance.log_dir.joinpath("mainsail-access.log")
         if not desti_access.exists():
             desti_access.symlink_to(access_log)
 
-        desti_error = instance.base.log_dir.joinpath(error_log.name)
+        desti_error = instance.log_dir.joinpath("mainsail-error.log")
         if not desti_error.exists():
             desti_error.symlink_to(error_log)
 
 
-def get_local_client_version(client: BaseWebClient) -> str | None:
+def get_local_client_version(client: BaseWebClient) -> str:
     relinfo_file = client.client_dir.joinpath("release_info.json")
     version_file = client.client_dir.joinpath(".version")
 
     if not client.client_dir.exists():
-        return None
+        return "-"
     if not relinfo_file.is_file() and not version_file.is_file():
         return "n/a"
 
     if relinfo_file.is_file():
         with open(relinfo_file, "r") as f:
-            return str(json.load(f)["version"])
+            return json.load(f)["version"]
     else:
         with open(version_file, "r") as f:
             return f.readlines()[0]
 
 
-def get_remote_client_version(client: BaseWebClient) -> str | None:
+def get_remote_client_version(client: BaseWebClient) -> str:
     try:
-        if (tag := get_latest_remote_tag(client.repo_path)) != "":
-            return str(tag)
-        return None
+        if (tag := get_latest_tag(client.repo_path)) != "":
+            return tag
+        return "ERROR"
     except Exception:
-        return None
+        return "ERROR"
 
 
 def backup_client_data(client: BaseWebClient) -> None:
@@ -154,7 +162,9 @@ def backup_client_data(client: BaseWebClient) -> None:
 
     bm = BackupManager()
     bm.backup_directory(f"{name}-{version}", src, dest)
-    bm.backup_file(client.config_file, dest)
+    if name == "mainsail":
+        c_json = MainsailData().client_dir.joinpath("config.json")
+        bm.backup_file(c_json, dest)
     bm.backup_file(NGINX_SITES_AVAILABLE.joinpath(name), dest)
 
 
@@ -177,24 +187,30 @@ def get_existing_clients() -> List[BaseWebClient]:
     return installed_clients
 
 
-def detect_client_cfg_conflict(curr_client: BaseWebClient) -> bool:
+def get_existing_client_config() -> List[BaseWebClient]:
+    clients = list(get_args(WebClientType))
+    installed_client_configs: List[BaseWebClient] = []
+    for client in clients:
+        c_config_data: BaseWebClientConfig = client.client_config
+        if c_config_data.config_dir.exists():
+            installed_client_configs.append(client)
+
+    return installed_client_configs
+
+
+def config_for_other_client_exist(client_to_ignore: WebClientType) -> bool:
     """
     Check if any other client configs are present on the system.
     It is usually not harmful, but chances are they can conflict each other.
     Multiple client configs are, at least, redundant to have them installed
-    :param curr_client: The client name to check for the conflict
+    :param client_to_ignore: The client name to ignore for the check
     :return: True, if other client configs were found, else False
     """
 
-    mainsail_cfg_status: ComponentStatus = get_client_config_status(MainsailData())
-    fluidd_cfg_status: ComponentStatus = get_client_config_status(FluiddData())
+    clients = set([c.name for c in get_existing_client_config()])
+    clients = clients - {client_to_ignore.value}
 
-    if curr_client.client == WebClientType.MAINSAIL and fluidd_cfg_status.status == 2:
-        return True
-    if curr_client.client == WebClientType.FLUIDD and mainsail_cfg_status.status == 2:
-        return True
-
-    return False
+    return True if len(clients) > 0 else False
 
 
 def get_download_url(base_url: str, client: BaseWebClient) -> str:
@@ -212,132 +228,3 @@ def get_download_url(base_url: str, client: BaseWebClient) -> str:
         return f"{base_url}/download/{unstable_tag}/{client.name}.zip"
     except Exception:
         return stable_url
-
-
-#################################################
-## NGINX RELATED FUNCTIONS
-#################################################
-
-
-def copy_upstream_nginx_cfg() -> None:
-    """
-    Creates an upstream.conf in /etc/nginx/conf.d
-    :return: None
-    """
-    source = MODULE_PATH.joinpath("assets/upstreams.conf")
-    target = NGINX_CONFD.joinpath("upstreams.conf")
-    try:
-        command = ["sudo", "cp", source, target]
-        run(command, stderr=PIPE, check=True)
-    except CalledProcessError as e:
-        log = f"Unable to create upstreams.conf: {e.stderr.decode()}"
-        Logger.print_error(log)
-        raise
-
-
-def copy_common_vars_nginx_cfg() -> None:
-    """
-    Creates a common_vars.conf in /etc/nginx/conf.d
-    :return: None
-    """
-    source = MODULE_PATH.joinpath("assets/common_vars.conf")
-    target = NGINX_CONFD.joinpath("common_vars.conf")
-    try:
-        command = ["sudo", "cp", source, target]
-        run(command, stderr=PIPE, check=True)
-    except CalledProcessError as e:
-        log = f"Unable to create upstreams.conf: {e.stderr.decode()}"
-        Logger.print_error(log)
-        raise
-
-
-def generate_nginx_cfg_from_template(name: str, template_src: Path, **kwargs) -> None:
-    """
-    Creates an NGINX config from a template file and
-    replaces all placeholders passed as kwargs. A placeholder must be defined
-    in the template file as %{placeholder}%.
-    :param name: name of the config to create
-    :param template_src: the path to the template file
-    :return: None
-    """
-    tmp = Path.home().joinpath(f"{name}.tmp")
-    shutil.copy(template_src, tmp)
-    with open(tmp, "r+") as f:
-        content = f.read()
-
-        for key, value in kwargs.items():
-            content = content.replace(f"%{key}%", str(value))
-
-        f.seek(0)
-        f.write(content)
-        f.truncate()
-
-    target = NGINX_SITES_AVAILABLE.joinpath(name)
-    try:
-        command = ["sudo", "mv", tmp, target]
-        run(command, stderr=PIPE, check=True)
-    except CalledProcessError as e:
-        log = f"Unable to create '{target}': {e.stderr.decode()}"
-        Logger.print_error(log)
-        raise
-
-
-def create_nginx_cfg(
-    display_name: str,
-    cfg_name: str,
-    template_src: Path,
-    **kwargs,
-) -> None:
-    from utils.sys_utils import set_nginx_permissions
-
-    try:
-        Logger.print_status(f"Creating NGINX config for {display_name} ...")
-
-        source = NGINX_SITES_AVAILABLE.joinpath(cfg_name)
-        target = NGINX_SITES_ENABLED.joinpath(cfg_name)
-        remove_file(Path("/etc/nginx/sites-enabled/default"), True)
-        generate_nginx_cfg_from_template(cfg_name, template_src=template_src, **kwargs)
-        create_symlink(source, target, True)
-        set_nginx_permissions()
-
-        Logger.print_ok(f"NGINX config for {display_name} successfully created.")
-    except Exception:
-        Logger.print_error(f"Creating NGINX config for {display_name} failed!")
-        raise
-
-
-def read_ports_from_nginx_configs() -> List[int]:
-    """
-    Helper function to iterate over all NGINX configs and read all ports defined for listen
-    :return: A sorted list of listen ports
-    """
-    if not NGINX_SITES_ENABLED.exists():
-        return []
-
-    port_list = []
-    for config in NGINX_SITES_ENABLED.iterdir():
-        if not config.is_file():
-            continue
-
-        with open(config, "r") as cfg:
-            lines = cfg.readlines()
-
-        for line in lines:
-            line = line.replace("default_server", "")
-            line = re.sub(r"[;:\[\]]", "", line.strip())
-            if line.startswith("listen") and line.split()[-1] not in port_list:
-                port_list.append(line.split()[-1])
-
-    ports_to_ints_list = [int(port) for port in port_list]
-    return sorted(ports_to_ints_list, key=lambda x: int(x))
-
-
-def is_valid_port(port: int, ports_in_use: List[int]) -> bool:
-    return port not in ports_in_use
-
-
-def get_next_free_port(ports_in_use: List[int]) -> int:
-    valid_ports = set(range(80, 7125))
-    used_ports = set(map(int, ports_in_use))
-
-    return min(valid_ports - used_ports)

kiauh/components/webui_client/fluidd_data.py

@@ -18,10 +18,11 @@ from components.webui_client.base_data import (
     WebClientConfigType,
     WebClientType,
 )
+from components.webui_client.client_utils import get_download_url
 from core.backup_manager import BACKUP_ROOT_DIR
 
 
-@dataclass()
+@dataclass(frozen=True)
 class FluiddConfigWeb(BaseWebClientConfig):
     client_config: WebClientConfigType = WebClientConfigType.FLUIDD
     name: str = client_config.value
@@ -33,7 +34,7 @@ class FluiddConfigWeb(BaseWebClientConfig):
     repo_url: str = "https://github.com/fluidd-core/fluidd-config.git"
 
 
-@dataclass()
+@dataclass(frozen=True)
 class FluiddData(BaseWebClient):
     BASE_DL_URL = "https://github.com/fluidd-core/fluidd/releases"
 
@@ -41,16 +42,13 @@ class FluiddData(BaseWebClient):
     name: str = client.value
     display_name: str = name.capitalize()
     client_dir: Path = Path.home().joinpath("fluidd")
-    config_file: Path = client_dir.joinpath("config.json")
     backup_dir: Path = BACKUP_ROOT_DIR.joinpath("fluidd-backups")
     repo_path: str = "fluidd-core/fluidd"
-    nginx_access_log: Path = Path("/var/log/nginx/fluidd-access.log")
-    nginx_error_log: Path = Path("/var/log/nginx/fluidd-error.log")
-    client_config: BaseWebClientConfig = None
-    download_url: str | None = None
 
-    def __post_init__(self):
-        from components.webui_client.client_utils import get_download_url
+    @property
+    def download_url(self) -> str:
+        return get_download_url(self.BASE_DL_URL, self)
 
-        self.client_config = FluiddConfigWeb()
-        self.download_url = get_download_url(self.BASE_DL_URL, self)
+    @property
+    def client_config(self) -> BaseWebClientConfig:
+        return FluiddConfigWeb()

kiauh/components/webui_client/mainsail_data.py

@@ -21,7 +21,7 @@ from components.webui_client.base_data import (
 from core.backup_manager import BACKUP_ROOT_DIR
 
 
-@dataclass()
+@dataclass(frozen=True)
 class MainsailConfigWeb(BaseWebClientConfig):
     client_config: WebClientConfigType = WebClientConfigType.MAINSAIL
     name: str = client_config.value
@@ -33,7 +33,7 @@ class MainsailConfigWeb(BaseWebClientConfig):
     repo_url: str = "https://github.com/mainsail-crew/mainsail-config.git"
 
 
-@dataclass()
+@dataclass(frozen=True)
 class MainsailData(BaseWebClient):
     BASE_DL_URL: str = "https://github.com/mainsail-crew/mainsail/releases"
 
@@ -41,16 +41,15 @@ class MainsailData(BaseWebClient):
     name: str = WebClientType.MAINSAIL.value
     display_name: str = name.capitalize()
     client_dir: Path = Path.home().joinpath("mainsail")
-    config_file: Path = client_dir.joinpath("config.json")
     backup_dir: Path = BACKUP_ROOT_DIR.joinpath("mainsail-backups")
     repo_path: str = "mainsail-crew/mainsail"
-    nginx_access_log: Path = Path("/var/log/nginx/mainsail-access.log")
-    nginx_error_log: Path = Path("/var/log/nginx/mainsail-error.log")
-    client_config: BaseWebClientConfig = None
-    download_url: str | None = None
 
-    def __post_init__(self):
+    @property
+    def download_url(self) -> str:
         from components.webui_client.client_utils import get_download_url
 
-        self.client_config = MainsailConfigWeb()
-        self.download_url = get_download_url(self.BASE_DL_URL, self)
+        return get_download_url(self.BASE_DL_URL, self)
+
+    @property
+    def client_config(self) -> BaseWebClientConfig:
+        return MainsailConfigWeb()

kiauh/components/webui_client/menus/client_remove_menu.py

@@ -6,44 +6,45 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import textwrap
-from typing import Type
+from typing import Optional, Type
 
 from components.webui_client import client_remove
-from components.webui_client.base_data import BaseWebClient
-from core.constants import COLOR_CYAN, COLOR_RED, RESET_FORMAT
+from components.webui_client.base_data import BaseWebClient, WebClientType
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
+from utils.constants import COLOR_CYAN, COLOR_RED, RESET_FORMAT
 
 
 # noinspection PyUnusedLocal
 class ClientRemoveMenu(BaseMenu):
     def __init__(
-        self, client: BaseWebClient, previous_menu: Type[BaseMenu] | None = None
+        self, client: BaseWebClient, previous_menu: Optional[Type[BaseMenu]] = None
     ):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
-        self.client: BaseWebClient = client
-        self.remove_client: bool = False
-        self.remove_client_cfg: bool = False
-        self.backup_config_json: bool = False
-        self.selection_state: bool = False
+        self.previous_menu = previous_menu
+        self.client = client
+        self.rm_client = False
+        self.rm_client_config = False
+        self.backup_mainsail_config_json = False
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         from core.menus.remove_menu import RemoveMenu
 
-        self.previous_menu = previous_menu if previous_menu is not None else RemoveMenu
+        self.previous_menu: Type[BaseMenu] = (
+            previous_menu if previous_menu is not None else RemoveMenu
+        )
 
     def set_options(self) -> None:
         self.options = {
-            "a": Option(method=self.toggle_all),
-            "1": Option(method=self.toggle_rm_client),
-            "2": Option(method=self.toggle_rm_client_config),
-            "3": Option(method=self.toggle_backup_config_json),
-            "c": Option(method=self.run_removal_process),
+            "0": Option(method=self.toggle_all, menu=False),
+            "1": Option(method=self.toggle_rm_client, menu=False),
+            "2": Option(method=self.toggle_rm_client_config, menu=False),
+            "c": Option(method=self.run_removal_process, menu=False),
         }
+        if self.client.client == WebClientType.MAINSAIL:
+            self.options["3"] = Option(self.toggle_backup_mainsail_config_json, False)
 
     def print_menu(self) -> None:
         client_name = self.client.display_name
@@ -55,9 +56,8 @@ class ClientRemoveMenu(BaseMenu):
         count = 62 - len(color) - len(RESET_FORMAT)
         checked = f"[{COLOR_CYAN}x{RESET_FORMAT}]"
         unchecked = "[ ]"
-        o1 = checked if self.remove_client else unchecked
-        o2 = checked if self.remove_client_cfg else unchecked
-        o3 = checked if self.backup_config_json else unchecked
+        o1 = checked if self.rm_client else unchecked
+        o2 = checked if self.rm_client_config else unchecked
         menu = textwrap.dedent(
             f"""
             ╔═══════════════════════════════════════════════════════╗
@@ -66,11 +66,23 @@ class ClientRemoveMenu(BaseMenu):
             ║ Enter a number and hit enter to select / deselect     ║
             ║ the specific option for removal.                      ║
             ╟───────────────────────────────────────────────────────╢
-            ║  a) {self._get_selection_state_str():37}             ║
+            ║  0) Select everything                                 ║
             ╟───────────────────────────────────────────────────────╢
             ║  1) {o1} Remove {client_name:16}                       ║
             ║  2) {o2} Remove {client_config_name:24}               ║
-            ║  3) {o3} Backup config.json                            ║
+            """
+        )[1:]
+
+        if self.client.client == WebClientType.MAINSAIL:
+            o3 = checked if self.backup_mainsail_config_json else unchecked
+            menu += textwrap.dedent(
+                f"""
+                ║  3) {o3} Backup config.json                            ║
+                """
+            )[1:]
+
+        menu += textwrap.dedent(
+            """
             ╟───────────────────────────────────────────────────────╢
             ║  C) Continue                                          ║
             ╟───────────────────────────────────────────────────────╢
@@ -79,25 +91,24 @@ class ClientRemoveMenu(BaseMenu):
         print(menu, end="")
 
     def toggle_all(self, **kwargs) -> None:
-        self.selection_state = not self.selection_state
-        self.remove_client = self.selection_state
-        self.remove_client_cfg = self.selection_state
-        self.backup_config_json = self.selection_state
+        self.rm_client = True
+        self.rm_client_config = True
+        self.backup_mainsail_config_json = True
 
     def toggle_rm_client(self, **kwargs) -> None:
-        self.remove_client = not self.remove_client
+        self.rm_client = not self.rm_client
 
     def toggle_rm_client_config(self, **kwargs) -> None:
-        self.remove_client_cfg = not self.remove_client_cfg
+        self.rm_client_config = not self.rm_client_config
 
-    def toggle_backup_config_json(self, **kwargs) -> None:
-        self.backup_config_json = not self.backup_config_json
+    def toggle_backup_mainsail_config_json(self, **kwargs) -> None:
+        self.backup_mainsail_config_json = not self.backup_mainsail_config_json
 
     def run_removal_process(self, **kwargs) -> None:
         if (
-            not self.remove_client
-            and not self.remove_client_cfg
-            and not self.backup_config_json
+            not self.rm_client
+            and not self.rm_client_config
+            and not self.backup_mainsail_config_json
         ):
             error = f"{COLOR_RED}Nothing selected ...{RESET_FORMAT}"
             print(error)
@@ -105,22 +116,11 @@ class ClientRemoveMenu(BaseMenu):
 
         client_remove.run_client_removal(
             client=self.client,
-            remove_client=self.remove_client,
-            remove_client_cfg=self.remove_client_cfg,
-            backup_config=self.backup_config_json,
+            rm_client=self.rm_client,
+            rm_client_config=self.rm_client_config,
+            backup_ms_config_json=self.backup_mainsail_config_json,
         )
 
-        self.remove_client = False
-        self.remove_client_cfg = False
-        self.backup_config_json = False
-
-        self._go_back()
-
-    def _get_selection_state_str(self) -> str:
-        return (
-            "Select everything" if not self.selection_state else "Deselect everything"
-        )
-
-    def _go_back(self, **kwargs) -> None:
-        if self.previous_menu is not None:
-            self.previous_menu().run()
+        self.rm_client = False
+        self.rm_client_config = False
+        self.backup_mainsail_config_json = False

kiauh/core/backup_manager/backup_manager.py

@@ -6,27 +6,22 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import shutil
 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
-
-
-class BackupManagerException(Exception):
-    pass
+from utils.logger import Logger
 
 
 # noinspection PyUnusedLocal
 # noinspection PyMethodMayBeStatic
 class BackupManager:
     def __init__(self, backup_root_dir: Path = BACKUP_ROOT_DIR):
-        self._backup_root_dir: Path = backup_root_dir
-        self._ignore_folders: List[str] = []
+        self._backup_root_dir = backup_root_dir
+        self._ignore_folders = None
 
     @property
     def backup_root_dir(self) -> Path:
@@ -44,7 +39,7 @@ class BackupManager:
     def ignore_folders(self, value: List[str]):
         self._ignore_folders = value
 
-    def backup_file(self, file: Path, target: Path | None = None, custom_filename=None):
+    def backup_file(self, file: Path, target: Path = None, custom_filename=None):
         Logger.print_status(f"Creating backup of {file} ...")
 
         if not file.exists():
@@ -67,9 +62,7 @@ class BackupManager:
         else:
             Logger.print_info(f"File '{file}' not found ...")
 
-    def backup_directory(
-        self, name: str, source: Path, target: Path | None = None
-    ) -> Path | None:
+    def backup_directory(self, name: str, source: Path, target: Path = None) -> None:
         Logger.print_status(f"Creating backup of {name} in {target} ...")
 
         if source is None or not Path(source).exists():
@@ -80,19 +73,19 @@ class BackupManager:
         try:
             date = get_current_date().get("date")
             time = get_current_date().get("time")
-            backup_target = target.joinpath(f"{name.lower()}-{date}-{time}")
-            shutil.copytree(source, backup_target, ignore=self.ignore_folders_func)
+            shutil.copytree(
+                source,
+                target.joinpath(f"{name.lower()}-{date}-{time}"),
+                ignore=self.ignore_folders_func,
+            )
             Logger.print_ok("Backup successful!")
-
-            return backup_target
-
         except OSError as e:
             Logger.print_error(f"Unable to backup directory '{source}':\n{e}")
-            raise BackupManagerException(f"Unable to backup directory '{source}':\n{e}")
+            return
 
-    def ignore_folders_func(self, dirpath, filenames) -> List[str]:
+    def ignore_folders_func(self, dirpath, filenames):
         return (
             [f for f in filenames if f in self._ignore_folders]
-            if self._ignore_folders
+            if self._ignore_folders is not None
             else []
         )

kiauh/core/instance_manager/base_instance.py

@@ -9,50 +9,153 @@
 
 from __future__ import annotations
 
-import re
-from dataclasses import dataclass, field
+from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import List
+from typing import List, Optional
 
-from utils.fs_utils import get_data_dir
-
-SUFFIX_BLACKLIST: List[str] = ["None", "mcu", "obico", "bambu", "companion"]
+from utils.constants import CURRENT_USER, SYSTEMD
 
 
-@dataclass(repr=True)
-class BaseInstance:
-    instance_type: type
-    suffix: str
-    log_file_name: str | None = None
-    data_dir: Path = field(init=False)
-    base_folders: List[Path] = field(init=False)
-    cfg_dir: Path = field(init=False)
-    log_dir: Path = field(init=False)
-    gcodes_dir: Path = field(init=False)
-    comms_dir: Path = field(init=False)
-    sysd_dir: Path = field(init=False)
-    is_legacy_instance: bool = field(init=False)
+class BaseInstance(ABC):
+    @classmethod
+    def blacklist(cls) -> List[str]:
+        return []
 
-    def __post_init__(self):
-        self.data_dir = get_data_dir(self.instance_type, self.suffix)
-        # the following attributes require the data_dir to be set
-        self.cfg_dir = self.data_dir.joinpath("config")
-        self.log_dir = self.data_dir.joinpath("logs")
-        self.gcodes_dir = self.data_dir.joinpath("gcodes")
-        self.comms_dir = self.data_dir.joinpath("comms")
-        self.sysd_dir = self.data_dir.joinpath("systemd")
-        self.is_legacy_instance = self._set_is_legacy_instance()
-        self.base_folders = [
+    def __init__(
+        self,
+        suffix: str,
+        instance_type: BaseInstance,
+    ):
+        self._instance_type = instance_type
+        self._suffix = suffix
+        self._user = CURRENT_USER
+        self._data_dir_name = self.get_data_dir_name_from_suffix()
+        self._data_dir = Path.home().joinpath(f"{self._data_dir_name}_data")
+        self._cfg_dir = self.data_dir.joinpath("config")
+        self._log_dir = self.data_dir.joinpath("logs")
+        self._comms_dir = self.data_dir.joinpath("comms")
+        self._sysd_dir = self.data_dir.joinpath("systemd")
+        self._gcodes_dir = self.data_dir.joinpath("gcodes")
+
+    @property
+    def instance_type(self) -> BaseInstance:
+        return self._instance_type
+
+    @instance_type.setter
+    def instance_type(self, value: BaseInstance) -> None:
+        self._instance_type = value
+
+    @property
+    def suffix(self) -> str:
+        return self._suffix
+
+    @suffix.setter
+    def suffix(self, value: str) -> None:
+        self._suffix = value
+
+    @property
+    def user(self) -> str:
+        return self._user
+
+    @user.setter
+    def user(self, value: str) -> None:
+        self._user = value
+
+    @property
+    def data_dir_name(self) -> str:
+        return self._data_dir_name
+
+    @data_dir_name.setter
+    def data_dir_name(self, value: str) -> None:
+        self._data_dir_name = value
+
+    @property
+    def data_dir(self) -> Path:
+        return self._data_dir
+
+    @data_dir.setter
+    def data_dir(self, value: Path) -> None:
+        self._data_dir = value
+
+    @property
+    def cfg_dir(self) -> Path:
+        return self._cfg_dir
+
+    @cfg_dir.setter
+    def cfg_dir(self, value: Path) -> None:
+        self._cfg_dir = value
+
+    @property
+    def log_dir(self) -> Path:
+        return self._log_dir
+
+    @log_dir.setter
+    def log_dir(self, value: Path) -> None:
+        self._log_dir = value
+
+    @property
+    def comms_dir(self) -> Path:
+        return self._comms_dir
+
+    @comms_dir.setter
+    def comms_dir(self, value: Path) -> None:
+        self._comms_dir = value
+
+    @property
+    def sysd_dir(self) -> Path:
+        return self._sysd_dir
+
+    @sysd_dir.setter
+    def sysd_dir(self, value: Path) -> None:
+        self._sysd_dir = value
+
+    @property
+    def gcodes_dir(self) -> Path:
+        return self._gcodes_dir
+
+    @gcodes_dir.setter
+    def gcodes_dir(self, value: Path) -> None:
+        self._gcodes_dir = value
+
+    @abstractmethod
+    def create(self) -> None:
+        raise NotImplementedError("Subclasses must implement the create method")
+
+    @abstractmethod
+    def delete(self) -> None:
+        raise NotImplementedError("Subclasses must implement the delete method")
+
+    def create_folders(self, add_dirs: Optional[List[Path]] = None) -> None:
+        dirs = [
             self.data_dir,
             self.cfg_dir,
             self.log_dir,
-            self.gcodes_dir,
             self.comms_dir,
             self.sysd_dir,
         ]
 
-    def _set_is_legacy_instance(self) -> bool:
-        legacy_pattern = r"^(?!printer)(.+)_data"
-        match = re.search(legacy_pattern, self.data_dir.name)
+        if add_dirs:
+            dirs.extend(add_dirs)
 
-        return True if (match and self.suffix != "") else False
+        for _dir in dirs:
+            _dir.mkdir(exist_ok=True)
+
+    def get_service_file_name(self, extension: bool = False) -> str:
+        from utils.common import convert_camelcase_to_kebabcase
+
+        name = convert_camelcase_to_kebabcase(self.__class__.__name__)
+        if self.suffix != "":
+            name += f"-{self.suffix}"
+
+        return name if not extension else f"{name}.service"
+
+    def get_service_file_path(self) -> Path:
+        return SYSTEMD.joinpath(self.get_service_file_name(extension=True))
+
+    def get_data_dir_name_from_suffix(self) -> str:
+        if self._suffix == "":
+            return "printer"
+        elif self._suffix.isdigit():
+            return f"printer_{self._suffix}"
+        else:
+            return self._suffix

kiauh/core/instance_manager/instance_manager.py

@@ -6,103 +6,187 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
+import re
+import subprocess
 from pathlib import Path
-from subprocess import CalledProcessError
-from typing import List
+from typing import List, Optional, TypeVar, Union
 
-from core.instance_type import InstanceType
-from core.logger import Logger
+from core.instance_manager.base_instance import BaseInstance
+from utils.constants import SYSTEMD
+from utils.logger import Logger
 from utils.sys_utils import cmd_sysctl_service
 
+T = TypeVar(name="T", bound=BaseInstance, covariant=True)
 
+
+# noinspection PyMethodMayBeStatic
 class InstanceManager:
-    @staticmethod
-    def enable(instance: InstanceType) -> None:
-        service_name: str = instance.service_file_path.name
+    def __init__(self, instance_type: T) -> None:
+        self._instance_type = instance_type
+        self._current_instance: Optional[T] = None
+        self._instance_suffix: Optional[str] = None
+        self._instance_service: Optional[str] = None
+        self._instance_service_full: Optional[str] = None
+        self._instance_service_path: Optional[str] = None
+        self._instances: List[T] = []
+
+    @property
+    def instance_type(self) -> T:
+        return self._instance_type
+
+    @instance_type.setter
+    def instance_type(self, value: T):
+        self._instance_type = value
+
+    @property
+    def current_instance(self) -> T:
+        return self._current_instance
+
+    @current_instance.setter
+    def current_instance(self, value: T) -> None:
+        self._current_instance = value
+        self.instance_suffix = value.suffix
+        self.instance_service = value.get_service_file_name()
+        self.instance_service_path = value.get_service_file_path()
+
+    @property
+    def instance_suffix(self) -> str:
+        return self._instance_suffix
+
+    @instance_suffix.setter
+    def instance_suffix(self, value: str):
+        self._instance_suffix = value
+
+    @property
+    def instance_service(self) -> str:
+        return self._instance_service
+
+    @instance_service.setter
+    def instance_service(self, value: str):
+        self._instance_service = value
+
+    @property
+    def instance_service_full(self) -> str:
+        return f"{self._instance_service}.service"
+
+    @property
+    def instance_service_path(self) -> str:
+        return self._instance_service_path
+
+    @instance_service_path.setter
+    def instance_service_path(self, value: str):
+        self._instance_service_path = value
+
+    @property
+    def instances(self) -> List[T]:
+        return self.find_instances()
+
+    @instances.setter
+    def instances(self, value: List[T]):
+        self._instances = value
+
+    def create_instance(self) -> None:
+        if self.current_instance is not None:
+            try:
+                self.current_instance.create()
+            except (OSError, subprocess.CalledProcessError) as e:
+                Logger.print_error(f"Creating instance failed: {e}")
+                raise
+        else:
+            raise ValueError("current_instance cannot be None")
+
+    def delete_instance(self) -> None:
+        if self.current_instance is not None:
+            try:
+                self.current_instance.delete()
+            except (OSError, subprocess.CalledProcessError) as e:
+                Logger.print_error(f"Removing instance failed: {e}")
+                raise
+        else:
+            raise ValueError("current_instance cannot be None")
+
+    def enable_instance(self) -> None:
         try:
-            cmd_sysctl_service(service_name, "enable")
-        except CalledProcessError as e:
-            Logger.print_error(f"Error enabling service {service_name}:")
+            cmd_sysctl_service(self.instance_service_full, "enable")
+        except subprocess.CalledProcessError as e:
+            Logger.print_error(f"Error enabling service {self.instance_service_full}:")
             Logger.print_error(f"{e}")
 
-    @staticmethod
-    def disable(instance: InstanceType) -> None:
-        service_name: str = instance.service_file_path.name
+    def disable_instance(self) -> None:
         try:
-            cmd_sysctl_service(service_name, "disable")
-        except CalledProcessError as e:
-            Logger.print_error(f"Error disabling {service_name}: {e}")
+            cmd_sysctl_service(self.instance_service_full, "disable")
+        except subprocess.CalledProcessError as e:
+            Logger.print_error(f"Error disabling {self.instance_service_full}:")
+            Logger.print_error(f"{e}")
+
+    def start_instance(self) -> None:
+        try:
+            cmd_sysctl_service(self.instance_service_full, "start")
+        except subprocess.CalledProcessError as e:
+            Logger.print_error(f"Error starting {self.instance_service_full}:")
+            Logger.print_error(f"{e}")
+
+    def restart_instance(self) -> None:
+        try:
+            cmd_sysctl_service(self.instance_service_full, "restart")
+        except subprocess.CalledProcessError as e:
+            Logger.print_error(f"Error restarting {self.instance_service_full}:")
+            Logger.print_error(f"{e}")
+
+    def start_all_instance(self) -> None:
+        for instance in self.instances:
+            self.current_instance = instance
+            self.start_instance()
+
+    def restart_all_instance(self) -> None:
+        for instance in self.instances:
+            self.current_instance = instance
+            self.restart_instance()
+
+    def stop_instance(self) -> None:
+        try:
+            cmd_sysctl_service(self.instance_service_full, "stop")
+        except subprocess.CalledProcessError as e:
+            Logger.print_error(f"Error stopping {self.instance_service_full}:")
+            Logger.print_error(f"{e}")
             raise
 
-    @staticmethod
-    def start(instance: InstanceType) -> None:
-        service_name: str = instance.service_file_path.name
-        try:
-            cmd_sysctl_service(service_name, "start")
-        except CalledProcessError as e:
-            Logger.print_error(f"Error starting {service_name}: {e}")
-            raise
+    def stop_all_instance(self) -> None:
+        for instance in self.instances:
+            self.current_instance = instance
+            self.stop_instance()
 
-    @staticmethod
-    def stop(instance: InstanceType) -> None:
-        name: str = instance.service_file_path.name
-        try:
-            cmd_sysctl_service(name, "stop")
-        except CalledProcessError as e:
-            Logger.print_error(f"Error stopping {name}: {e}")
-            raise
+    def find_instances(self) -> List[T]:
+        from utils.common import convert_camelcase_to_kebabcase
 
-    @staticmethod
-    def restart(instance: InstanceType) -> None:
-        name: str = instance.service_file_path.name
-        try:
-            cmd_sysctl_service(name, "restart")
-        except CalledProcessError as e:
-            Logger.print_error(f"Error restarting {name}: {e}")
-            raise
+        name = convert_camelcase_to_kebabcase(self.instance_type.__name__)
+        pattern = re.compile(f"^{name}(-[0-9a-zA-Z]+)?.service$")
+        excluded = self.instance_type.blacklist()
 
-    @staticmethod
-    def start_all(instances: List[InstanceType]) -> None:
-        for instance in instances:
-            InstanceManager.start(instance)
+        service_list = [
+            Path(SYSTEMD, service)
+            for service in SYSTEMD.iterdir()
+            if pattern.search(service.name)
+            and not any(s in service.name for s in excluded)
+        ]
 
-    @staticmethod
-    def stop_all(instances: List[InstanceType]) -> None:
-        for instance in instances:
-            InstanceManager.stop(instance)
+        instance_list = [
+            self.instance_type(suffix=self._get_instance_suffix(name, service))
+            for service in service_list
+        ]
 
-    @staticmethod
-    def restart_all(instances: List[InstanceType]) -> None:
-        for instance in instances:
-            InstanceManager.restart(instance)
+        return sorted(instance_list, key=lambda x: self._sort_instance_list(x.suffix))
 
-    @staticmethod
-    def remove(instance: InstanceType) -> None:
-        from utils.fs_utils import run_remove_routines
-        from utils.sys_utils import remove_system_service
+    def _get_instance_suffix(self, name: str, file_path: Path) -> str:
+        # to get the suffix of the instance, we remove the name of the instance from
+        # the file name, if the remaining part an empty string we return it
+        # otherwise there is and hyphen left, and we return the part after the hyphen
+        suffix = file_path.stem[len(name) :]
+        return suffix[1:] if suffix else ""
 
-        try:
-            # remove the service file
-            service_file_path: Path = instance.service_file_path
-            if service_file_path is not None:
-                remove_system_service(service_file_path.name)
+    def _sort_instance_list(self, s: Union[int, str, None]):
+        if s is None:
+            return
 
-            # then remove all the log files
-            if (
-                not instance.log_file_name
-                or not instance.base.log_dir
-                or not instance.base.log_dir.exists()
-            ):
-                return
-
-            files = instance.base.log_dir.iterdir()
-            logs = [f for f in files if f.name.startswith(instance.log_file_name)]
-            for log in logs:
-                Logger.print_status(f"Remove '{log}'")
-                run_remove_routines(log)
-
-        except Exception as e:
-            Logger.print_error(f"Error removing service: {e}")
-            raise
+        return int(s) if s.isdigit() else s

kiauh/core/instance_manager/name_scheme.py

@@ -0,0 +1,8 @@
+from enum import Enum, unique
+
+
+@unique
+class NameScheme(Enum):
+    SINGLE = "SINGLE"
+    INDEX = "INDEX"
+    CUSTOM = "CUSTOM"

kiauh/core/instance_type.py

@@ -1,25 +0,0 @@
-# ======================================================================= #
-#  Copyright (C) 2020 - 2024 Dominik Willner <th33xitus@gmail.com>        #
-#                                                                         #
-#  This file is part of KIAUH - Klipper Installation And Update Helper    #
-#  https://github.com/dw-0/kiauh                                          #
-#                                                                         #
-#  This file may be distributed under the terms of the GNU GPLv3 license  #
-# ======================================================================= #
-
-from typing import TypeVar
-
-from components.klipper.klipper import Klipper
-from components.moonraker.moonraker import Moonraker
-from components.octoeverywhere.octoeverywhere import Octoeverywhere
-from extensions.obico.moonraker_obico import MoonrakerObico
-from extensions.telegram_bot.moonraker_telegram_bot import MoonrakerTelegramBot
-
-InstanceType = TypeVar(
-    "InstanceType",
-    Klipper,
-    Moonraker,
-    MoonrakerTelegramBot,
-    MoonrakerObico,
-    Octoeverywhere,
-)

kiauh/core/menus/__init__.py

@@ -6,11 +6,10 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 from dataclasses import dataclass
 from enum import Enum
-from typing import Any, Callable, Type
+from typing import Any, Callable, Union
 
 
 @dataclass
@@ -18,14 +17,13 @@ class Option:
     """
     Represents a menu option.
     :param method: Method that will be used to call the menu option
+    :param menu: Flag for singaling that another menu will be opened
     :param opt_index: Can be used to pass the user input to the menu option
     :param opt_data: Can be used to pass any additional data to the menu option
     """
 
-    def __repr__(self):
-        return f"Option(method={self.method.__name__}, opt_index={self.opt_index}, opt_data={self.opt_data})"
-
-    method: Type[Callable]
+    method: Union[Callable, None] = None
+    menu: bool = False
     opt_index: str = ""
     opt_data: Any = None
 

kiauh/core/menus/advanced_menu.py

@@ -6,10 +6,9 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import textwrap
-from typing import Type
+from typing import Optional, Type
 
 from components.klipper import KLIPPER_DIR
 from components.klipper.klipper import Klipper
@@ -22,37 +21,37 @@ from components.klipper_firmware.menus.klipper_flash_menu import (
 )
 from components.moonraker import MOONRAKER_DIR
 from components.moonraker.moonraker import Moonraker
-from core.constants import COLOR_YELLOW, RESET_FORMAT
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
-from procedures.system import change_system_hostname
+from utils.constants import COLOR_YELLOW, RESET_FORMAT
 from utils.git_utils import rollback_repository
 
 
 # noinspection PyUnusedLocal
 # noinspection PyMethodMayBeStatic
 class AdvancedMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None) -> None:
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
+        self.previous_menu = previous_menu
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         from core.menus.main_menu import MainMenu
 
-        self.previous_menu = previous_menu if previous_menu is not None else MainMenu
+        self.previous_menu: Type[BaseMenu] = (
+            previous_menu if previous_menu is not None else MainMenu
+        )
 
-    def set_options(self) -> None:
+    def set_options(self):
         self.options = {
-            "1": Option(method=self.build),
-            "2": Option(method=self.flash),
-            "3": Option(method=self.build_flash),
-            "4": Option(method=self.get_id),
-            "5": Option(method=self.klipper_rollback),
-            "6": Option(method=self.moonraker_rollback),
-            "7": Option(method=self.change_hostname),
+            "1": Option(method=self.build, menu=True),
+            "2": Option(method=self.flash, menu=False),
+            "3": Option(method=self.build_flash, menu=False),
+            "4": Option(method=self.get_id, menu=False),
+            "5": Option(method=self.klipper_rollback, menu=True),
+            "6": Option(method=self.moonraker_rollback, menu=True),
         }
 
-    def print_menu(self) -> None:
+    def print_menu(self):
         header = " [ Advanced Menu ] "
         color = COLOR_YELLOW
         count = 62 - len(color) - len(RESET_FORMAT)
@@ -65,34 +64,30 @@ class AdvancedMenu(BaseMenu):
             ║  1) [Build]               │  5) [Klipper]             ║
             ║  2) [Flash]               │  6) [Moonraker]           ║
             ║  3) [Build + Flash]       │                           ║
-            ║  4) [Get MCU ID]          │ System:                   ║
-            ║                           │  7) [Change hostname]     ║
+            ║  4) [Get MCU ID]          │                           ║
             ╟───────────────────────────┴───────────────────────────╢
             """
         )[1:]
         print(menu, end="")
 
-    def klipper_rollback(self, **kwargs) -> None:
+    def klipper_rollback(self, **kwargs):
         rollback_repository(KLIPPER_DIR, Klipper)
 
-    def moonraker_rollback(self, **kwargs) -> None:
+    def moonraker_rollback(self, **kwargs):
         rollback_repository(MOONRAKER_DIR, Moonraker)
 
-    def build(self, **kwargs) -> None:
+    def build(self, **kwargs):
         KlipperBuildFirmwareMenu(previous_menu=self.__class__).run()
 
-    def flash(self, **kwargs) -> None:
+    def flash(self, **kwargs):
         KlipperFlashMethodMenu(previous_menu=self.__class__).run()
 
-    def build_flash(self, **kwargs) -> None:
+    def build_flash(self, **kwargs):
         KlipperBuildFirmwareMenu(previous_menu=KlipperFlashMethodMenu).run()
         KlipperFlashMethodMenu(previous_menu=self.__class__).run()
 
-    def get_id(self, **kwargs) -> None:
+    def get_id(self, **kwargs):
         KlipperSelectMcuConnectionMenu(
             previous_menu=self.__class__,
             standalone=True,
         ).run()
-
-    def change_hostname(self, **kwargs) -> None:
-        change_system_hostname()

kiauh/core/menus/backup_menu.py

@@ -6,10 +6,9 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import textwrap
-from typing import Type
+from typing import Optional, Type
 
 from components.klipper.klipper_utils import backup_klipper_dir
 from components.klipperscreen.klipperscreen import backup_klipperscreen_dir
@@ -23,38 +22,40 @@ from components.webui_client.client_utils import (
 )
 from components.webui_client.fluidd_data import FluiddData
 from components.webui_client.mainsail_data import MainsailData
-from core.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
 from utils.common import backup_printer_config_dir
+from utils.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 
 
 # noinspection PyUnusedLocal
 # noinspection PyMethodMayBeStatic
 class BackupMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None) -> None:
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
+        self.previous_menu = previous_menu
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         from core.menus.main_menu import MainMenu
 
-        self.previous_menu = previous_menu if previous_menu is not None else MainMenu
+        self.previous_menu: Type[BaseMenu] = (
+            previous_menu if previous_menu is not None else MainMenu
+        )
 
     def set_options(self) -> None:
         self.options = {
-            "1": Option(method=self.backup_klipper),
-            "2": Option(method=self.backup_moonraker),
-            "3": Option(method=self.backup_printer_config),
-            "4": Option(method=self.backup_moonraker_db),
-            "5": Option(method=self.backup_mainsail),
-            "6": Option(method=self.backup_fluidd),
-            "7": Option(method=self.backup_mainsail_config),
-            "8": Option(method=self.backup_fluidd_config),
-            "9": Option(method=self.backup_klipperscreen),
+            "1": Option(method=self.backup_klipper, menu=False),
+            "2": Option(method=self.backup_moonraker, menu=False),
+            "3": Option(method=self.backup_printer_config, menu=False),
+            "4": Option(method=self.backup_moonraker_db, menu=False),
+            "5": Option(method=self.backup_mainsail, menu=False),
+            "6": Option(method=self.backup_fluidd, menu=False),
+            "7": Option(method=self.backup_mainsail_config, menu=False),
+            "8": Option(method=self.backup_fluidd_config, menu=False),
+            "9": Option(method=self.backup_klipperscreen, menu=False),
         }
 
-    def print_menu(self) -> None:
+    def print_menu(self):
         header = " [ Backup Menu ] "
         line1 = f"{COLOR_YELLOW}INFO: Backups are located in '~/kiauh-backups'{RESET_FORMAT}"
         color = COLOR_CYAN
@@ -80,29 +81,29 @@ class BackupMenu(BaseMenu):
         )[1:]
         print(menu, end="")
 
-    def backup_klipper(self, **kwargs) -> None:
+    def backup_klipper(self, **kwargs):
         backup_klipper_dir()
 
-    def backup_moonraker(self, **kwargs) -> None:
+    def backup_moonraker(self, **kwargs):
         backup_moonraker_dir()
 
-    def backup_printer_config(self, **kwargs) -> None:
+    def backup_printer_config(self, **kwargs):
         backup_printer_config_dir()
 
-    def backup_moonraker_db(self, **kwargs) -> None:
+    def backup_moonraker_db(self, **kwargs):
         backup_moonraker_db_dir()
 
-    def backup_mainsail(self, **kwargs) -> None:
+    def backup_mainsail(self, **kwargs):
         backup_client_data(MainsailData())
 
-    def backup_fluidd(self, **kwargs) -> None:
+    def backup_fluidd(self, **kwargs):
         backup_client_data(FluiddData())
 
-    def backup_mainsail_config(self, **kwargs) -> None:
+    def backup_mainsail_config(self, **kwargs):
         backup_client_config_data(MainsailData())
 
-    def backup_fluidd_config(self, **kwargs) -> None:
+    def backup_fluidd_config(self, **kwargs):
         backup_client_config_data(FluiddData())
 
-    def backup_klipperscreen(self, **kwargs) -> None:
+    def backup_klipperscreen(self, **kwargs):
         backup_klipperscreen_dir()

kiauh/core/menus/base_menu.py

@@ -14,25 +14,24 @@ import sys
 import textwrap
 import traceback
 from abc import abstractmethod
-from typing import Dict, Type
+from typing import Dict, Optional, Type
 
-from core.constants import (
+from core.menus import FooterType, Option
+from utils.constants import (
     COLOR_CYAN,
     COLOR_GREEN,
     COLOR_RED,
     COLOR_YELLOW,
     RESET_FORMAT,
 )
-from core.logger import Logger
-from core.menus import FooterType, Option
-from utils.input_utils import get_selection_input
+from utils.logger import Logger
 
 
-def clear() -> None:
+def clear():
     subprocess.call("clear", shell=True)
 
 
-def print_header() -> None:
+def print_header():
     line1 = " [ KIAUH ] "
     line2 = "Klipper Installation And Update Helper"
     line3 = ""
@@ -50,7 +49,7 @@ def print_header() -> None:
     print(header, end="")
 
 
-def print_quit_footer() -> None:
+def print_quit_footer():
     text = "Q) Quit"
     color = COLOR_RED
     count = 62 - len(color) - len(RESET_FORMAT)
@@ -63,7 +62,7 @@ def print_quit_footer() -> None:
     print(footer, end="")
 
 
-def print_back_footer() -> None:
+def print_back_footer():
     text = "B) « Back"
     color = COLOR_GREEN
     count = 62 - len(color) - len(RESET_FORMAT)
@@ -76,7 +75,7 @@ def print_back_footer() -> None:
     print(footer, end="")
 
 
-def print_back_help_footer() -> None:
+def print_back_help_footer():
     text1 = "B) « Back"
     text2 = "H) Help [?]"
     color1 = COLOR_GREEN
@@ -91,7 +90,7 @@ def print_back_help_footer() -> None:
     print(footer, end="")
 
 
-def print_blank_footer() -> None:
+def print_blank_footer():
     print("╚═══════════════════════════════════════════════════════╝")
 
 
@@ -110,46 +109,42 @@ class BaseMenu(metaclass=PostInitCaller):
     default_option: Option = None
     input_label_txt: str = "Perform action"
     header: bool = False
-    previous_menu: Type[BaseMenu] | None = None
-    help_menu: Type[BaseMenu] | None = None
+    previous_menu: Type[BaseMenu] = None
+    help_menu: Type[BaseMenu] = None
     footer_type: FooterType = FooterType.BACK
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, **kwargs):
         if type(self) is BaseMenu:
             raise NotImplementedError("BaseMenu cannot be instantiated directly.")
 
-    def __post_init__(self) -> None:
+    def __post_init__(self):
         self.set_previous_menu(self.previous_menu)
         self.set_options()
 
         # conditionally add options based on footer type
         if self.footer_type is FooterType.QUIT:
-            self.options["q"] = Option(method=self.__exit)
+            self.options["q"] = Option(method=self.__exit, menu=False)
         if self.footer_type is FooterType.BACK:
-            self.options["b"] = Option(method=self.__go_back)
+            self.options["b"] = Option(method=self.__go_back, menu=False)
         if self.footer_type is FooterType.BACK_HELP:
-            self.options["b"] = Option(method=self.__go_back)
-            self.options["h"] = Option(method=self.__go_to_help)
+            self.options["b"] = Option(method=self.__go_back, menu=False)
+            self.options["h"] = Option(method=self.__go_to_help, menu=False)
         # if defined, add the default option to the options dict
         if self.default_option is not None:
             self.options[""] = self.default_option
 
-    def __go_back(self, **kwargs) -> None:
-        if self.previous_menu is None:
-            return
+    def __go_back(self, **kwargs):
         self.previous_menu().run()
 
-    def __go_to_help(self, **kwargs) -> None:
-        if self.help_menu is None:
-            return
-        self.help_menu(previous_menu=self.__class__).run()
+    def __go_to_help(self, **kwargs):
+        self.help_menu(previous_menu=self).run()
 
-    def __exit(self, **kwargs) -> None:
+    def __exit(self, **kwargs):
         Logger.print_ok("###### Happy printing!", False)
         sys.exit(0)
 
     @abstractmethod
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         raise NotImplementedError
 
     @abstractmethod
@@ -178,20 +173,43 @@ class BaseMenu(metaclass=PostInitCaller):
         self.print_menu()
         self.print_footer()
 
+    def validate_user_input(self, usr_input: str) -> Option:
+        """
+        Validate the user input and either return an Option, a string or None
+        :param usr_input: The user input in form of a string
+        :return: Option, str or None
+        """
+        usr_input = usr_input.lower()
+        option = self.options.get(usr_input, Option(None, False, "", None))
+
+        # if option/usr_input is None/empty string, we execute the menus default option if specified
+        if (option is None or usr_input == "") and self.default_option is not None:
+            self.default_option.opt_index = usr_input
+            return self.default_option
+
+        # user selected a regular option
+        option.opt_index = usr_input
+        return option
+
+    def handle_user_input(self) -> Option:
+        """Handle the user input, return the validated input or print an error."""
+        while True:
+            print(f"{COLOR_CYAN}###### {self.input_label_txt}: {RESET_FORMAT}", end="")
+            usr_input = input().lower()
+            validated_input = self.validate_user_input(usr_input)
+
+            if validated_input.method is not None:
+                return validated_input
+            else:
+                Logger.print_error("Invalid input!", False)
+
     def run(self) -> None:
         """Start the menu lifecycle. When this function returns, the lifecycle of the menu ends."""
         try:
             self.display_menu()
-            option = get_selection_input(self.input_label_txt, self.options)
-            selected_option: Option = self.options.get(option)
-
-            selected_option.method(
-                opt_index=selected_option.opt_index,
-                opt_data=selected_option.opt_data,
-            )
-
+            option = self.handle_user_input()
+            option.method(opt_index=option.opt_index, opt_data=option.opt_data)
             self.run()
-
         except Exception as e:
             Logger.print_error(
                 f"An unexpected error occured:\n{e}\n{traceback.format_exc()}"

kiauh/core/menus/install_menu.py

@@ -6,53 +6,52 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import textwrap
-from typing import Type
+from typing import Optional, Type
 
 from components.crowsnest.crowsnest import install_crowsnest
 from components.klipper import klipper_setup
 from components.klipperscreen.klipperscreen import install_klipperscreen
 from components.mobileraker.mobileraker import install_mobileraker
 from components.moonraker import moonraker_setup
-from components.octoeverywhere.octoeverywhere_setup import install_octoeverywhere
 from components.webui_client import client_setup
 from components.webui_client.client_config import client_config_setup
 from components.webui_client.fluidd_data import FluiddData
 from components.webui_client.mainsail_data import MainsailData
-from core.constants import COLOR_GREEN, RESET_FORMAT
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
+from utils.constants import COLOR_GREEN, RESET_FORMAT
 
 
 # noinspection PyUnusedLocal
 # noinspection PyMethodMayBeStatic
 class InstallMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None) -> None:
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
+        self.previous_menu = previous_menu
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         from core.menus.main_menu import MainMenu
 
-        self.previous_menu = previous_menu if previous_menu is not None else MainMenu
+        self.previous_menu: Type[BaseMenu] = (
+            previous_menu if previous_menu is not None else MainMenu
+        )
 
     def set_options(self) -> None:
         self.options = {
-            "1": Option(method=self.install_klipper),
-            "2": Option(method=self.install_moonraker),
-            "3": Option(method=self.install_mainsail),
-            "4": Option(method=self.install_fluidd),
-            "5": Option(method=self.install_mainsail_config),
-            "6": Option(method=self.install_fluidd_config),
-            "7": Option(method=self.install_klipperscreen),
-            "8": Option(method=self.install_mobileraker),
-            "9": Option(method=self.install_crowsnest),
-            "10": Option(method=self.install_octoeverywhere),
+            "1": Option(method=self.install_klipper, menu=False),
+            "2": Option(method=self.install_moonraker, menu=False),
+            "3": Option(method=self.install_mainsail, menu=False),
+            "4": Option(method=self.install_fluidd, menu=False),
+            "5": Option(method=self.install_mainsail_config, menu=False),
+            "6": Option(method=self.install_fluidd_config, menu=False),
+            "7": Option(method=self.install_klipperscreen, menu=False),
+            "8": Option(method=self.install_mobileraker, menu=False),
+            "9": Option(method=self.install_crowsnest, menu=False),
         }
 
-    def print_menu(self) -> None:
+    def print_menu(self):
         header = " [ Installation Menu ] "
         color = COLOR_GREEN
         count = 62 - len(color) - len(RESET_FORMAT)
@@ -70,40 +69,37 @@ class InstallMenu(BaseMenu):
             ║  4) [Fluidd]              │ Webcam Streamer:          ║
             ║                           │  9) [Crowsnest]           ║
             ║ Client-Config:            │                           ║
-            ║  5) [Mainsail-Config]     │ Remote Access:            ║
-            ║  6) [Fluidd-Config]       │ 10) [OctoEverywhere]      ║
+            ║  5) [Mainsail-Config]     │                           ║
+            ║  6) [Fluidd-Config]       │                           ║
             ║                           │                           ║
             ╟───────────────────────────┴───────────────────────────╢
             """
         )[1:]
         print(menu, end="")
 
-    def install_klipper(self, **kwargs) -> None:
+    def install_klipper(self, **kwargs):
         klipper_setup.install_klipper()
 
-    def install_moonraker(self, **kwargs) -> None:
+    def install_moonraker(self, **kwargs):
         moonraker_setup.install_moonraker()
 
-    def install_mainsail(self, **kwargs) -> None:
+    def install_mainsail(self, **kwargs):
         client_setup.install_client(MainsailData())
 
-    def install_mainsail_config(self, **kwargs) -> None:
+    def install_mainsail_config(self, **kwargs):
         client_config_setup.install_client_config(MainsailData())
 
-    def install_fluidd(self, **kwargs) -> None:
+    def install_fluidd(self, **kwargs):
         client_setup.install_client(FluiddData())
 
-    def install_fluidd_config(self, **kwargs) -> None:
+    def install_fluidd_config(self, **kwargs):
         client_config_setup.install_client_config(FluiddData())
 
-    def install_klipperscreen(self, **kwargs) -> None:
+    def install_klipperscreen(self, **kwargs):
         install_klipperscreen()
 
-    def install_mobileraker(self, **kwargs) -> None:
+    def install_mobileraker(self, **kwargs):
         install_mobileraker()
 
-    def install_crowsnest(self, **kwargs) -> None:
+    def install_crowsnest(self, **kwargs):
         install_crowsnest()
-
-    def install_octoeverywhere(self, **kwargs) -> None:
-        install_octoeverywhere()

kiauh/core/menus/main_menu.py

@@ -6,11 +6,9 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
-
 import sys
 import textwrap
-from typing import Callable, Type
+from typing import Optional, Type
 
 from components.crowsnest.crowsnest import get_crowsnest_status
 from components.klipper.klipper_utils import get_klipper_status
@@ -18,22 +16,12 @@ from components.klipperscreen.klipperscreen import get_klipperscreen_status
 from components.log_uploads.menus.log_upload_menu import LogUploadMenu
 from components.mobileraker.mobileraker import get_mobileraker_status
 from components.moonraker.moonraker_utils import get_moonraker_status
-from components.octoeverywhere.octoeverywhere_setup import get_octoeverywhere_status
 from components.webui_client.client_utils import (
     get_client_status,
     get_current_client_config,
 )
 from components.webui_client.fluidd_data import FluiddData
 from components.webui_client.mainsail_data import MainsailData
-from core.constants import (
-    COLOR_CYAN,
-    COLOR_GREEN,
-    COLOR_MAGENTA,
-    COLOR_RED,
-    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,54 +30,59 @@ from core.menus.install_menu import InstallMenu
 from core.menus.remove_menu import RemoveMenu
 from core.menus.settings_menu import SettingsMenu
 from core.menus.update_menu import UpdateMenu
-from core.types import ComponentStatus, StatusMap, StatusText
 from extensions.extensions_menu import ExtensionsMenu
-from utils.common import get_kiauh_version
+from utils.constants import (
+    COLOR_CYAN,
+    COLOR_GREEN,
+    COLOR_MAGENTA,
+    COLOR_RED,
+    COLOR_YELLOW,
+    RESET_FORMAT,
+)
+from utils.logger import Logger
+from utils.types import ComponentStatus
 
 
 # noinspection PyUnusedLocal
 # noinspection PyMethodMayBeStatic
 class MainMenu(BaseMenu):
-    def __init__(self) -> None:
+    def __init__(self):
         super().__init__()
 
-        self.header: bool = True
-        self.footer_type: FooterType = FooterType.QUIT
+        self.header = True
+        self.footer_type = FooterType.QUIT
 
-        self.version = ""
-        self.kl_status = self.kl_owner = self.kl_repo = ""
-        self.mr_status = self.mr_owner = self.mr_repo = ""
+        self.kl_status = self.kl_repo = self.mr_status = self.mr_repo = ""
         self.ms_status = self.fl_status = self.ks_status = self.mb_status = ""
-        self.cn_status = self.cc_status = self.oe_status = ""
-        self._init_status()
+        self.cn_status = self.cc_status = ""
+        self.init_status()
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         """MainMenu does not have a previous menu"""
         pass
 
     def set_options(self) -> None:
         self.options = {
-            "0": Option(method=self.log_upload_menu),
-            "1": Option(method=self.install_menu),
-            "2": Option(method=self.update_menu),
-            "3": Option(method=self.remove_menu),
-            "4": Option(method=self.advanced_menu),
-            "5": Option(method=self.backup_menu),
-            "e": Option(method=self.extension_menu),
-            "s": Option(method=self.settings_menu),
+            "0": Option(method=self.log_upload_menu, menu=True),
+            "1": Option(method=self.install_menu, menu=True),
+            "2": Option(method=self.update_menu, menu=True),
+            "3": Option(method=self.remove_menu, menu=True),
+            "4": Option(method=self.advanced_menu, menu=True),
+            "5": Option(method=self.backup_menu, menu=True),
+            "e": Option(method=self.extension_menu, menu=True),
+            "s": Option(method=self.settings_menu, menu=True),
         }
 
-    def _init_status(self) -> None:
-        status_vars = ["kl", "mr", "ms", "fl", "ks", "mb", "cn", "oe"]
+    def init_status(self) -> None:
+        status_vars = ["kl", "mr", "ms", "fl", "ks", "mb", "cn"]
         for var in status_vars:
             setattr(
                 self,
                 f"{var}_status",
-                f"{COLOR_RED}Not installed{RESET_FORMAT}",
+                f"{COLOR_RED}Not installed!{RESET_FORMAT}",
             )
 
-    def _fetch_status(self) -> None:
-        self.version = get_kiauh_version()
+    def fetch_status(self) -> None:
         self._get_component_status("kl", get_klipper_status)
         self._get_component_status("mr", get_moonraker_status)
         self._get_component_status("ms", get_client_status, MainsailData())
@@ -98,40 +91,34 @@ class MainMenu(BaseMenu):
         self._get_component_status("ks", get_klipperscreen_status)
         self._get_component_status("mb", get_mobileraker_status)
         self._get_component_status("cn", get_crowsnest_status)
-        self._get_component_status("oe", get_octoeverywhere_status)
 
-    def _get_component_status(self, name: str, status_fn: Callable, *args) -> None:
+    def _get_component_status(self, name: str, status_fn: callable, *args) -> None:
         status_data: ComponentStatus = status_fn(*args)
-        code: int = status_data.status
-        status: StatusText = StatusMap[code]
-        owner: str = status_data.owner
-        repo: str = status_data.repo
-        instance_count: int = status_data.instances
+        code: int = status_data.get("status").value.code
+        status: str = status_data.get("status").value.txt
+        repo: str = status_data.get("repo")
+        instance_count: int = status_data.get("instances")
 
         count_txt: str = ""
-        if instance_count > 0 and code == 2:
+        if instance_count > 0 and code == 1:
             count_txt = f": {instance_count}"
 
         setattr(self, f"{name}_status", self._format_by_code(code, status, count_txt))
-        setattr(self, f"{name}_owner", f"{COLOR_CYAN}{owner}{RESET_FORMAT}")
         setattr(self, f"{name}_repo", f"{COLOR_CYAN}{repo}{RESET_FORMAT}")
 
     def _format_by_code(self, code: int, status: str, count: str) -> str:
-        color = COLOR_RED
-        if code == 0:
-            color = COLOR_RED
-        elif code == 1:
-            color = COLOR_YELLOW
+        if code == 1:
+            return f"{COLOR_GREEN}{status}{count}{RESET_FORMAT}"
         elif code == 2:
-            color = COLOR_GREEN
+            return f"{COLOR_RED}{status}{count}{RESET_FORMAT}"
 
-        return f"{color}{status}{count}{RESET_FORMAT}"
+        return f"{COLOR_YELLOW}{status}{count}{RESET_FORMAT}"
 
-    def print_menu(self) -> None:
-        self._fetch_status()
+    def print_menu(self):
+        self.fetch_status()
 
         header = " [ Main Menu ] "
-        footer1 = f"{COLOR_CYAN}{self.version}{RESET_FORMAT}"
+        footer1 = f"{COLOR_CYAN}KIAUH v6.0.0{RESET_FORMAT}"
         footer2 = f"Changelog: {COLOR_MAGENTA}https://git.io/JnmlX{RESET_FORMAT}"
         color = COLOR_CYAN
         count = 62 - len(color) - len(RESET_FORMAT)
@@ -143,20 +130,17 @@ class MainMenu(BaseMenu):
             ║ {color}{header:~^{count}}{RESET_FORMAT} ║
             ╟──────────────────┬────────────────────────────────────╢
             ║  0) [Log-Upload] │   Klipper: {self.kl_status:<{pad1}} ║
-            ║                  │     Owner: {self.kl_owner:<{pad1}} ║
-            ║  1) [Install]    │      Repo: {self.kl_repo:<{pad1}} ║
-            ║  2) [Update]     ├────────────────────────────────────╢
-            ║  3) [Remove]     │ Moonraker: {self.mr_status:<{pad1}} ║
-            ║  4) [Advanced]   │     Owner: {self.mr_owner:<{pad1}} ║
-            ║  5) [Backup]     │      Repo: {self.mr_repo:<{pad1}} ║
-            ║                  ├────────────────────────────────────╢
-            ║  S) [Settings]   │        Mainsail: {self.ms_status:<{pad2}} ║
+            ║                  │      Repo: {self.kl_repo:<{pad1}} ║
+            ║  1) [Install]    ├────────────────────────────────────╢
+            ║  2) [Update]     │ Moonraker: {self.mr_status:<{pad1}} ║
+            ║  3) [Remove]     │      Repo: {self.mr_repo:<{pad1}} ║
+            ║  4) [Advanced]   ├────────────────────────────────────╢
+            ║  5) [Backup]     │        Mainsail: {self.ms_status:<{pad2}} ║
             ║                  │          Fluidd: {self.fl_status:<{pad2}} ║
-            ║ Community:       │   Client-Config: {self.cc_status:<{pad2}} ║
-            ║  E) [Extensions] │                                    ║
-            ║                  │   KlipperScreen: {self.ks_status:<{pad2}} ║
-            ║                  │     Mobileraker: {self.mb_status:<{pad2}} ║
-            ║                  │  OctoEverywhere: {self.oe_status:<{pad2}} ║
+            ║  S) [Settings]   │   Client-Config: {self.cc_status:<{pad2}} ║
+            ║                  │                                    ║
+            ║ Community:       │   KlipperScreen: {self.ks_status:<{pad2}} ║
+            ║  E) [Extensions] │     Mobileraker: {self.mb_status:<{pad2}} ║
             ║                  │       Crowsnest: {self.cn_status:<{pad2}} ║
             ╟──────────────────┼────────────────────────────────────╢
             ║ {footer1:^25} │ {footer2:^43} ║
@@ -165,30 +149,30 @@ class MainMenu(BaseMenu):
         )[1:]
         print(menu, end="")
 
-    def exit(self, **kwargs) -> None:
+    def exit(self, **kwargs):
         Logger.print_ok("###### Happy printing!", False)
         sys.exit(0)
 
-    def log_upload_menu(self, **kwargs) -> None:
+    def log_upload_menu(self, **kwargs):
         LogUploadMenu().run()
 
-    def install_menu(self, **kwargs) -> None:
+    def install_menu(self, **kwargs):
         InstallMenu(previous_menu=self.__class__).run()
 
-    def update_menu(self, **kwargs) -> None:
+    def update_menu(self, **kwargs):
         UpdateMenu(previous_menu=self.__class__).run()
 
-    def remove_menu(self, **kwargs) -> None:
+    def remove_menu(self, **kwargs):
         RemoveMenu(previous_menu=self.__class__).run()
 
-    def advanced_menu(self, **kwargs) -> None:
+    def advanced_menu(self, **kwargs):
         AdvancedMenu(previous_menu=self.__class__).run()
 
-    def backup_menu(self, **kwargs) -> None:
+    def backup_menu(self, **kwargs):
         BackupMenu(previous_menu=self.__class__).run()
 
-    def settings_menu(self, **kwargs) -> None:
+    def settings_menu(self, **kwargs):
         SettingsMenu(previous_menu=self.__class__).run()
 
-    def extension_menu(self, **kwargs) -> None:
+    def extension_menu(self, **kwargs):
         ExtensionsMenu(previous_menu=self.__class__).run()

kiauh/core/menus/remove_menu.py

@@ -6,10 +6,9 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import textwrap
-from typing import Type
+from typing import Optional, Type
 
 from components.crowsnest.crowsnest import remove_crowsnest
 from components.klipper.menus.klipper_remove_menu import KlipperRemoveMenu
@@ -18,40 +17,40 @@ from components.mobileraker.mobileraker import remove_mobileraker
 from components.moonraker.menus.moonraker_remove_menu import (
     MoonrakerRemoveMenu,
 )
-from components.octoeverywhere.octoeverywhere_setup import remove_octoeverywhere
 from components.webui_client.fluidd_data import FluiddData
 from components.webui_client.mainsail_data import MainsailData
 from components.webui_client.menus.client_remove_menu import ClientRemoveMenu
-from core.constants import COLOR_RED, RESET_FORMAT
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
+from utils.constants import COLOR_RED, RESET_FORMAT
 
 
 # noinspection PyUnusedLocal
 # noinspection PyMethodMayBeStatic
 class RemoveMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None) -> None:
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
+        self.previous_menu = previous_menu
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         from core.menus.main_menu import MainMenu
 
-        self.previous_menu = previous_menu if previous_menu is not None else MainMenu
+        self.previous_menu: Type[BaseMenu] = (
+            previous_menu if previous_menu is not None else MainMenu
+        )
 
-    def set_options(self) -> None:
+    def set_options(self):
         self.options = {
-            "1": Option(method=self.remove_klipper),
-            "2": Option(method=self.remove_moonraker),
-            "3": Option(method=self.remove_mainsail),
-            "4": Option(method=self.remove_fluidd),
-            "5": Option(method=self.remove_klipperscreen),
-            "6": Option(method=self.remove_mobileraker),
-            "7": Option(method=self.remove_crowsnest),
-            "8": Option(method=self.remove_octoeverywhere),
+            "1": Option(method=self.remove_klipper, menu=True),
+            "2": Option(method=self.remove_moonraker, menu=True),
+            "3": Option(method=self.remove_mainsail, menu=True),
+            "4": Option(method=self.remove_fluidd, menu=True),
+            "5": Option(method=self.remove_klipperscreen, menu=True),
+            "6": Option(method=self.remove_mobileraker, menu=True),
+            "7": Option(method=self.remove_crowsnest, menu=True),
         }
 
-    def print_menu(self) -> None:
+    def print_menu(self):
         header = " [ Remove Menu ] "
         color = COLOR_RED
         count = 62 - len(color) - len(RESET_FORMAT)
@@ -62,41 +61,36 @@ class RemoveMenu(BaseMenu):
             ╟───────────────────────────────────────────────────────╢
             ║ INFO: Configurations and/or any backups will be kept! ║
             ╟───────────────────────────┬───────────────────────────╢
-            ║ Firmware & API:           │ Android / iOS:            ║
-            ║  1) [Klipper]             │  6) [Mobileraker]         ║
+            ║ Firmware & API:           │ Touchscreen GUI:          ║
+            ║  1) [Klipper]             │  5) [KlipperScreen]       ║
             ║  2) [Moonraker]           │                           ║
-            ║                           │ Webcam Streamer:          ║
-            ║ Klipper Webinterface:     │  7) [Crowsnest]           ║
+            ║                           │ Android / iOS:            ║
+            ║ Klipper Webinterface:     │  6) [Mobileraker]         ║
             ║  3) [Mainsail]            │                           ║
-            ║  4) [Fluidd]              │ Remote Access:            ║
-            ║                           │  8) [OctoEverywhere]      ║
-            ║ Touchscreen GUI:          │                           ║
-            ║  5) [KlipperScreen]       │                           ║
+            ║  4) [Fluidd]              │ Webcam Streamer:          ║
+            ║                           │  7) [Crowsnest]           ║
             ╟───────────────────────────┴───────────────────────────╢
             """
         )[1:]
         print(menu, end="")
 
-    def remove_klipper(self, **kwargs) -> None:
+    def remove_klipper(self, **kwargs):
         KlipperRemoveMenu(previous_menu=self.__class__).run()
 
-    def remove_moonraker(self, **kwargs) -> None:
+    def remove_moonraker(self, **kwargs):
         MoonrakerRemoveMenu(previous_menu=self.__class__).run()
 
-    def remove_mainsail(self, **kwargs) -> None:
+    def remove_mainsail(self, **kwargs):
         ClientRemoveMenu(previous_menu=self.__class__, client=MainsailData()).run()
 
-    def remove_fluidd(self, **kwargs) -> None:
+    def remove_fluidd(self, **kwargs):
         ClientRemoveMenu(previous_menu=self.__class__, client=FluiddData()).run()
 
-    def remove_klipperscreen(self, **kwargs) -> None:
+    def remove_klipperscreen(self, **kwargs):
         remove_klipperscreen()
 
-    def remove_mobileraker(self, **kwargs) -> None:
+    def remove_mobileraker(self, **kwargs):
         remove_mobileraker()
 
-    def remove_crowsnest(self, **kwargs) -> None:
+    def remove_crowsnest(self, **kwargs):
         remove_crowsnest()
-
-    def remove_octoeverywhere(self, **kwargs) -> None:
-        remove_octoeverywhere()

kiauh/core/menus/settings_menu.py

@@ -6,48 +6,55 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
-
+import shutil
 import textwrap
-from typing import Literal, Tuple, Type
+from pathlib import Path
+from typing import Optional, Tuple, Type
 
-from core.constants import COLOR_CYAN, COLOR_GREEN, RESET_FORMAT
-from core.logger import DialogType, Logger
+from components.klipper import KLIPPER_DIR
+from components.klipper.klipper import Klipper
+from components.moonraker import MOONRAKER_DIR
+from components.moonraker.moonraker import Moonraker
+from core.instance_manager.instance_manager import InstanceManager
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
-from core.settings.kiauh_settings import KiauhSettings, RepoSettings
-from procedures.switch_repo import run_switch_repo_routine
+from core.settings.kiauh_settings import KiauhSettings
+from utils.constants import COLOR_CYAN, COLOR_GREEN, RESET_FORMAT
+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
 # noinspection PyMethodMayBeStatic
 class SettingsMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None) -> None:
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
-        self.klipper_repo: str | None = None
-        self.moonraker_repo: str | None = None
-        self.mainsail_unstable: bool | None = None
-        self.fluidd_unstable: bool | None = None
-        self.auto_backups_enabled: bool | None = None
+        self.previous_menu = previous_menu
+        self.klipper_repo = None
+        self.moonraker_repo = None
+        self.mainsail_unstable = None
+        self.fluidd_unstable = None
+        self.auto_backups_enabled = None
         self._load_settings()
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         from core.menus.main_menu import MainMenu
 
-        self.previous_menu = previous_menu if previous_menu is not None else MainMenu
+        self.previous_menu: Type[BaseMenu] = (
+            previous_menu if previous_menu is not None else MainMenu
+        )
 
     def set_options(self) -> None:
         self.options = {
-            "1": Option(method=self.set_klipper_repo),
-            "2": Option(method=self.set_moonraker_repo),
-            "3": Option(method=self.toggle_mainsail_release),
-            "4": Option(method=self.toggle_fluidd_release),
-            "5": Option(method=self.toggle_backup_before_update),
+            "1": Option(method=self.set_klipper_repo, menu=True),
+            "2": Option(method=self.set_moonraker_repo, menu=True),
+            "3": Option(method=self.toggle_mainsail_release, menu=True),
+            "4": Option(method=self.toggle_fluidd_release, menu=False),
+            "5": Option(method=self.toggle_backup_before_update, menu=False),
         }
 
-    def print_menu(self) -> None:
+    def print_menu(self):
         header = " [ KIAUH Settings ] "
         color = COLOR_CYAN
         count = 62 - len(color) - len(RESET_FORMAT)
@@ -87,7 +94,7 @@ class SettingsMenu(BaseMenu):
         )[1:]
         print(menu, end="")
 
-    def _load_settings(self) -> None:
+    def _load_settings(self):
         self.settings = KiauhSettings()
 
         self._format_repo_str("klipper")
@@ -97,28 +104,22 @@ class SettingsMenu(BaseMenu):
         self.mainsail_unstable = self.settings.mainsail.unstable_releases
         self.fluidd_unstable = self.settings.fluidd.unstable_releases
 
-    def _format_repo_str(self, repo_name: Literal["klipper", "moonraker"]) -> None:
-        repo: RepoSettings = self.settings[repo_name]
-        repo_str = f"{'/'.join(repo.repo_url.rsplit('/', 2)[-2:])}"
-        branch_str = f"({COLOR_CYAN}@ {repo.branch}{RESET_FORMAT})"
-
-        setattr(
-            self,
-            f"{repo_name}_repo",
-            f"{COLOR_CYAN}{repo_str}{RESET_FORMAT} {branch_str}",
-        )
+    def _format_repo_str(self, repo_name: str) -> None:
+        repo = self.settings.get(repo_name, "repo_url")
+        repo = f"{'/'.join(repo.rsplit('/', 2)[-2:])}"
+        branch = self.settings.get(repo_name, "branch")
+        branch = f"({COLOR_CYAN}@ {branch}{RESET_FORMAT})"
+        setattr(self, f"{repo_name}_repo", f"{COLOR_CYAN}{repo}{RESET_FORMAT} {branch}")
 
     def _gather_input(self) -> Tuple[str, str]:
         Logger.print_dialog(
             DialogType.ATTENTION,
             [
-                "There is no input validation in place! Make sure your the input is "
-                "valid and has no typos or invalid characters! For the change to take "
-                "effect, the new repository will be cloned. A backup of the old "
-                "repository will be created.",
-                "\n\n",
-                "Make sure you don't have any ongoing prints running, as the services "
-                "will be restarted during this process! You will loose any ongoing print!",
+                "There is no input validation in place! Make sure your"
+                " input is valid and has no typos! For any change to"
+                " take effect, the repository must be cloned again. "
+                "Make sure you don't have any ongoing prints running, "
+                "as the services will be restarted!"
             ],
         )
         repo = get_string_input(
@@ -132,7 +133,7 @@ class SettingsMenu(BaseMenu):
 
         return repo, branch
 
-    def _set_repo(self, repo_name: Literal["klipper", "moonraker"]) -> None:
+    def _set_repo(self, repo_name: str):
         repo_url, branch = self._gather_input()
         display_name = repo_name.capitalize()
         Logger.print_dialog(
@@ -143,16 +144,14 @@ class SettingsMenu(BaseMenu):
                 f"New {display_name} repository branch:",
                 f"● {branch}",
             ],
+            end="",
         )
 
         if get_confirm("Apply changes?", allow_go_back=True):
-            repo: RepoSettings = self.settings[repo_name]
-            repo.repo_url = repo_url
-            repo.branch = branch
-
+            self.settings.set(repo_name, "repo_url", repo_url)
+            self.settings.set(repo_name, "branch", branch)
             self.settings.save()
             self._load_settings()
-
             Logger.print_ok("Changes saved!")
         else:
             Logger.print_info(
@@ -162,28 +161,49 @@ class SettingsMenu(BaseMenu):
 
         Logger.print_status(f"Switching to {display_name}'s new source repository ...")
         self._switch_repo(repo_name)
+        Logger.print_ok(f"Switched to {repo_url} at branch {branch}!")
 
-    def _switch_repo(self, name: Literal["klipper", "moonraker"]) -> None:
-        repo: RepoSettings = self.settings[name]
-        run_switch_repo_routine(name, repo)
+    def _switch_repo(self, name: str) -> None:
+        target_dir: Path
+        if name == "klipper":
+            target_dir = KLIPPER_DIR
+            _type = Klipper
+        elif name == "moonraker":
+            target_dir = MOONRAKER_DIR
+            _type = Moonraker
+        else:
+            Logger.print_error("Invalid repository name!")
+            return
 
-    def set_klipper_repo(self, **kwargs) -> None:
+        if target_dir.exists():
+            shutil.rmtree(target_dir)
+
+        im = InstanceManager(_type)
+        im.stop_all_instance()
+
+        repo = self.settings.get(name, "repo_url")
+        branch = self.settings.get(name, "branch")
+        git_clone_wrapper(repo, target_dir, branch)
+
+        im.start_all_instance()
+
+    def set_klipper_repo(self, **kwargs):
         self._set_repo("klipper")
 
-    def set_moonraker_repo(self, **kwargs) -> None:
+    def set_moonraker_repo(self, **kwargs):
         self._set_repo("moonraker")
 
-    def toggle_mainsail_release(self, **kwargs) -> None:
+    def toggle_mainsail_release(self, **kwargs):
         self.mainsail_unstable = not self.mainsail_unstable
         self.settings.mainsail.unstable_releases = self.mainsail_unstable
         self.settings.save()
 
-    def toggle_fluidd_release(self, **kwargs) -> None:
+    def toggle_fluidd_release(self, **kwargs):
         self.fluidd_unstable = not self.fluidd_unstable
         self.settings.fluidd.unstable_releases = self.fluidd_unstable
         self.settings.save()
 
-    def toggle_backup_before_update(self, **kwargs) -> None:
+    def toggle_backup_before_update(self, **kwargs):
         self.auto_backups_enabled = not self.auto_backups_enabled
         self.settings.kiauh.backup_before_update = self.auto_backups_enabled
         self.settings.save()

kiauh/core/menus/update_menu.py

@@ -6,10 +6,9 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import textwrap
-from typing import Callable, List, Type
+from typing import Optional, Type
 
 from components.crowsnest.crowsnest import get_crowsnest_status, update_crowsnest
 from components.klipper.klipper_setup import update_klipper
@@ -26,10 +25,6 @@ from components.mobileraker.mobileraker import (
 )
 from components.moonraker.moonraker_setup import update_moonraker
 from components.moonraker.moonraker_utils import get_moonraker_status
-from components.octoeverywhere.octoeverywhere_setup import (
-    get_octoeverywhere_status,
-    update_octoeverywhere,
-)
 from components.webui_client.client_config.client_config_setup import (
     update_client_config,
 )
@@ -40,252 +35,153 @@ from components.webui_client.client_utils import (
 )
 from components.webui_client.fluidd_data import FluiddData
 from components.webui_client.mainsail_data import MainsailData
-from core.constants import (
+from core.menus import Option
+from core.menus.base_menu import BaseMenu
+from utils.constants import (
     COLOR_GREEN,
     COLOR_RED,
     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 core.types import ComponentStatus
-from utils.input_utils import get_confirm
-from utils.sys_utils import (
-    get_upgradable_packages,
-    update_system_package_lists,
-    upgrade_system_packages,
-)
+from utils.types import ComponentStatus
 
 
 # noinspection PyUnusedLocal
 # noinspection PyMethodMayBeStatic
 class UpdateMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None) -> None:
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
+        self.previous_menu = previous_menu
 
-        self.packages: List[str] = []
-        self.package_count: int = 0
-
-        self.klipper_local = self.klipper_remote = ""
-        self.moonraker_local = self.moonraker_remote = ""
-        self.mainsail_local = self.mainsail_remote = ""
-        self.mainsail_config_local = self.mainsail_config_remote = ""
-        self.fluidd_local = self.fluidd_remote = ""
-        self.fluidd_config_local = self.fluidd_config_remote = ""
-        self.klipperscreen_local = self.klipperscreen_remote = ""
-        self.mobileraker_local = self.mobileraker_remote = ""
-        self.crowsnest_local = self.crowsnest_remote = ""
-        self.octoeverywhere_local = self.octoeverywhere_remote = ""
+        self.kl_local = self.kl_remote = self.mr_local = self.mr_remote = ""
+        self.ms_local = self.ms_remote = self.fl_local = self.fl_remote = ""
+        self.mc_local = self.mc_remote = self.fc_local = self.fc_remote = ""
+        self.ks_local = self.ks_remote = self.mb_local = self.mb_remote = ""
+        self.cn_local = self.cn_remote = ""
 
         self.mainsail_data = MainsailData()
         self.fluidd_data = FluiddData()
-        self.status_data = {
-            "klipper": {"installed": False, "local": None, "remote": None},
-            "moonraker": {"installed": False, "local": None, "remote": None},
-            "mainsail": {"installed": False, "local": None, "remote": None},
-            "mainsail_config": {"installed": False, "local": None, "remote": None},
-            "fluidd": {"installed": False, "local": None, "remote": None},
-            "fluidd_config": {"installed": False, "local": None, "remote": None},
-            "mobileraker": {"installed": False, "local": None, "remote": None},
-            "klipperscreen": {"installed": False, "local": None, "remote": None},
-            "crowsnest": {"installed": False, "local": None, "remote": None},
-            "octoeverywhere": {"installed": False, "local": None, "remote": None},
-        }
+        self._fetch_update_status()
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         from core.menus.main_menu import MainMenu
 
-        self.previous_menu = previous_menu if previous_menu is not None else MainMenu
+        self.previous_menu: Type[BaseMenu] = (
+            previous_menu if previous_menu is not None else MainMenu
+        )
 
     def set_options(self) -> None:
         self.options = {
-            "a": Option(self.update_all),
-            "1": Option(self.update_klipper),
-            "2": Option(self.update_moonraker),
-            "3": Option(self.update_mainsail),
-            "4": Option(self.update_fluidd),
-            "5": Option(self.update_mainsail_config),
-            "6": Option(self.update_fluidd_config),
-            "7": Option(self.update_klipperscreen),
-            "8": Option(self.update_mobileraker),
-            "9": Option(self.update_crowsnest),
-            "10": Option(self.update_octoeverywhere),
-            "11": Option(self.upgrade_system_packages),
+            "0": Option(self.update_all, menu=False),
+            "1": Option(self.update_klipper, menu=False),
+            "2": Option(self.update_moonraker, menu=False),
+            "3": Option(self.update_mainsail, menu=False),
+            "4": Option(self.update_fluidd, menu=False),
+            "5": Option(self.update_mainsail_config, menu=False),
+            "6": Option(self.update_fluidd_config, menu=False),
+            "7": Option(self.update_klipperscreen, menu=False),
+            "8": Option(self.update_mobileraker, menu=False),
+            "9": Option(self.update_crowsnest, menu=False),
+            "10": Option(self.upgrade_system_packages, menu=False),
         }
 
-    def print_menu(self) -> None:
-        spinner = Spinner("Loading update menu, please wait", color="green")
-        spinner.start()
-
+    def print_menu(self):
         self._fetch_update_status()
 
-        spinner.stop()
-
         header = " [ Update Menu ] "
         color = COLOR_GREEN
         count = 62 - len(color) - len(RESET_FORMAT)
-
-        sysupgrades: str = "No upgrades available."
-        padding = 29
-        if self.package_count > 0:
-            sysupgrades = (
-                f"{COLOR_GREEN}{self.package_count} upgrades available!{RESET_FORMAT}"
-            )
-            padding = 38
-
         menu = textwrap.dedent(
             f"""
             ╔═══════════════════════════════════════════════════════╗
             ║ {color}{header:~^{count}}{RESET_FORMAT} ║
             ╟───────────────────────┬───────────────┬───────────────╢
-            ║  a) Update all        │               │               ║
+            ║  0) Update all        │               │               ║
             ║                       │ Current:      │ Latest:       ║
             ║ Klipper & API:        ├───────────────┼───────────────╢
-            ║  1) Klipper           │ {self.klipper_local:<22} │ {self.klipper_remote:<22} ║
-            ║  2) Moonraker         │ {self.moonraker_local:<22} │ {self.moonraker_remote:<22} ║
+            ║  1) Klipper           │ {self.kl_local:<22} │ {self.kl_remote:<22} ║
+            ║  2) Moonraker         │ {self.mr_local:<22} │ {self.mr_remote:<22} ║
             ║                       │               │               ║
             ║ Webinterface:         ├───────────────┼───────────────╢
-            ║  3) Mainsail          │ {self.mainsail_local:<22} │ {self.mainsail_remote:<22} ║
-            ║  4) Fluidd            │ {self.fluidd_local:<22} │ {self.fluidd_remote:<22} ║
+            ║  3) Mainsail          │ {self.ms_local:<22} │ {self.ms_remote:<22} ║
+            ║  4) Fluidd            │ {self.fl_local:<22} │ {self.fl_remote:<22} ║
             ║                       │               │               ║
             ║ Client-Config:        ├───────────────┼───────────────╢
-            ║  5) Mainsail-Config   │ {self.mainsail_config_local:<22} │ {self.mainsail_config_remote:<22} ║
-            ║  6) Fluidd-Config     │ {self.fluidd_config_local:<22} │ {self.fluidd_config_remote:<22} ║
+            ║  5) Mainsail-Config   │ {self.mc_local:<22} │ {self.mc_remote:<22} ║
+            ║  6) Fluidd-Config     │ {self.fc_local:<22} │ {self.fc_remote:<22} ║
             ║                       │               │               ║
             ║ Other:                ├───────────────┼───────────────╢
-            ║  7) KlipperScreen     │ {self.klipperscreen_local:<22} │ {self.klipperscreen_remote:<22} ║
-            ║  8) Mobileraker       │ {self.mobileraker_local:<22} │ {self.mobileraker_remote:<22} ║
-            ║  9) Crowsnest         │ {self.crowsnest_local:<22} │ {self.crowsnest_remote:<22} ║
-            ║ 10) OctoEverywhere    │ {self.octoeverywhere_local:<22} │ {self.octoeverywhere_remote:<22} ║
+            ║  7) KlipperScreen     │ {self.ks_local:<22} │ {self.ks_remote:<22} ║
+            ║  8) Mobileraker       │ {self.mb_local:<22} │ {self.mb_remote:<22} ║
+            ║  9) Crowsnest         │ {self.cn_local:<22} │ {self.cn_remote:<22} ║
             ║                       ├───────────────┴───────────────╢
-            ║ 11) System            │ {sysupgrades:^{padding}} ║
+            ║ 10) System            │                               ║
             ╟───────────────────────┴───────────────────────────────╢
             """
         )[1:]
         print(menu, end="")
 
-    def update_all(self, **kwargs) -> None:
+    def update_all(self, **kwargs):
         print("update_all")
 
-    def update_klipper(self, **kwargs) -> None:
-        if self._check_is_installed("klipper"):
-            update_klipper()
+    def update_klipper(self, **kwargs):
+        update_klipper()
 
-    def update_moonraker(self, **kwargs) -> None:
-        if self._check_is_installed("moonraker"):
-            update_moonraker()
+    def update_moonraker(self, **kwargs):
+        update_moonraker()
 
-    def update_mainsail(self, **kwargs) -> None:
-        if self._check_is_installed("mainsail"):
-            update_client(self.mainsail_data)
+    def update_mainsail(self, **kwargs):
+        update_client(self.mainsail_data)
 
-    def update_mainsail_config(self, **kwargs) -> None:
-        if self._check_is_installed("mainsail_config"):
-            update_client_config(self.mainsail_data)
+    def update_mainsail_config(self, **kwargs):
+        update_client_config(self.mainsail_data)
 
-    def update_fluidd(self, **kwargs) -> None:
-        if self._check_is_installed("fluidd"):
-            update_client(self.fluidd_data)
+    def update_fluidd(self, **kwargs):
+        update_client(self.fluidd_data)
 
-    def update_fluidd_config(self, **kwargs) -> None:
-        if self._check_is_installed("fluidd_config"):
-            update_client_config(self.fluidd_data)
+    def update_fluidd_config(self, **kwargs):
+        update_client_config(self.fluidd_data)
 
-    def update_klipperscreen(self, **kwargs) -> None:
-        if self._check_is_installed("klipperscreen"):
-            update_klipperscreen()
+    def update_klipperscreen(self, **kwargs):
+        update_klipperscreen()
 
-    def update_mobileraker(self, **kwargs) -> None:
-        if self._check_is_installed("mobileraker"):
-            update_mobileraker()
+    def update_mobileraker(self, **kwargs):
+        update_mobileraker()
 
-    def update_crowsnest(self, **kwargs) -> None:
-        if self._check_is_installed("crowsnest"):
-            update_crowsnest()
+    def update_crowsnest(self, **kwargs):
+        update_crowsnest()
 
-    def update_octoeverywhere(self, **kwargs) -> None:
-        if self._check_is_installed("octoeverywhere"):
-            update_octoeverywhere()
+    def upgrade_system_packages(self, **kwargs): ...
 
-    def upgrade_system_packages(self, **kwargs) -> None:
-        self._run_system_updates()
-
-    def _fetch_update_status(self) -> None:
-        self._set_status_data("klipper", get_klipper_status)
-        self._set_status_data("moonraker", get_moonraker_status)
-        self._set_status_data("mainsail", get_client_status, self.mainsail_data, True)
-        self._set_status_data(
-            "mainsail_config", get_client_config_status, self.mainsail_data
-        )
-        self._set_status_data("fluidd", get_client_status, self.fluidd_data, True)
-        self._set_status_data(
-            "fluidd_config", get_client_config_status, self.fluidd_data
-        )
-        self._set_status_data("klipperscreen", get_klipperscreen_status)
-        self._set_status_data("mobileraker", get_mobileraker_status)
-        self._set_status_data("crowsnest", get_crowsnest_status)
-        self._set_status_data("octoeverywhere", get_octoeverywhere_status)
-
-        update_system_package_lists(silent=True)
-        self.packages = get_upgradable_packages()
-        self.package_count = len(self.packages)
+    def _fetch_update_status(self):
+        # klipper
+        self._get_update_status("kl", get_klipper_status)
+        # moonraker
+        self._get_update_status("mr", get_moonraker_status)
+        # mainsail
+        self._get_update_status("ms", get_client_status, self.mainsail_data, True)
+        # mainsail-config
+        self._get_update_status("mc", get_client_config_status, self.mainsail_data)
+        # fluidd
+        self._get_update_status("fl", get_client_status, self.fluidd_data, True)
+        # fluidd-config
+        self._get_update_status("fc", get_client_config_status, self.fluidd_data)
+        # klipperscreen
+        self._get_update_status("ks", get_klipperscreen_status)
+        # mobileraker
+        self._get_update_status("mb", get_mobileraker_status)
+        # crowsnest
+        self._get_update_status("cn", get_crowsnest_status)
 
     def _format_local_status(self, local_version, remote_version) -> str:
-        color = COLOR_RED
-        if not local_version:
-            color = COLOR_RED
-        elif local_version == remote_version:
-            color = COLOR_GREEN
-        elif local_version != remote_version:
-            color = COLOR_YELLOW
+        if local_version == remote_version:
+            return f"{COLOR_GREEN}{local_version}{RESET_FORMAT}"
+        return f"{COLOR_YELLOW}{local_version}{RESET_FORMAT}"
 
-        return f"{color}{local_version or '-'}{RESET_FORMAT}"
-
-    def _set_status_data(self, name: str, status_fn: Callable, *args) -> None:
-        comp_status: ComponentStatus = status_fn(*args)
-
-        self.status_data[name]["installed"] = True if comp_status.status == 2 else False
-        self.status_data[name]["local"] = comp_status.local
-        self.status_data[name]["remote"] = comp_status.remote
-
-        self._set_status_string(name)
-
-    def _set_status_string(self, name: str) -> None:
-        local_status = self.status_data[name].get("local", None)
-        remote_status = self.status_data[name].get("remote", None)
-
-        color = COLOR_GREEN if remote_status else COLOR_RED
-        local_txt = self._format_local_status(local_status, remote_status)
-        remote_txt = f"{color}{remote_status or '-'}{RESET_FORMAT}"
-
-        setattr(self, f"{name}_local", local_txt)
-        setattr(self, f"{name}_remote", remote_txt)
-
-    def _check_is_installed(self, name: str) -> bool:
-        if not self.status_data[name]["installed"]:
-            Logger.print_info(f"{name.capitalize()} is not installed! Skipped ...")
-            return False
-        return True
-
-    def _run_system_updates(self) -> None:
-        if not self.packages:
-            Logger.print_info("No system upgrades available!")
-            return
-
-        try:
-            pkgs: str = ", ".join(self.packages)
-            Logger.print_dialog(
-                DialogType.CUSTOM,
-                ["The following packages will be upgraded:", "\n\n", pkgs],
-                custom_title="UPGRADABLE SYSTEM UPDATES",
-            )
-            if not get_confirm("Continue?"):
-                return
-            Logger.print_status("Upgrading system packages ...")
-            upgrade_system_packages(self.packages)
-        except Exception as e:
-            Logger.print_error(f"Error upgrading system packages:\n{e}")
-            raise
+    def _get_update_status(self, name: str, status_fn: callable, *args) -> None:
+        status_data: ComponentStatus = status_fn(*args)
+        local_ver = status_data.get("local")
+        remote_ver = status_data.get("remote")
+        color = COLOR_GREEN if remote_ver != "ERROR" else COLOR_RED
+        setattr(self, f"{name}_local", self._format_local_status(local_ver, remote_ver))
+        setattr(self, f"{name}_remote", f"{color}{remote_ver}{RESET_FORMAT}")

kiauh/core/settings/kiauh_settings.py

@@ -8,15 +8,14 @@
 # ======================================================================= #
 from __future__ import annotations
 
-from dataclasses import dataclass, field
-from typing import Any
+from typing import Union
 
-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
@@ -25,21 +24,33 @@ DEFAULT_CFG = PROJECT_ROOT.joinpath("default.kiauh.cfg")
 CUSTOM_CFG = PROJECT_ROOT.joinpath("kiauh.cfg")
 
 
-@dataclass
 class AppSettings:
-    backup_before_update: bool | None = field(default=None)
+    def __init__(self) -> None:
+        self.backup_before_update = None
 
 
-@dataclass
-class RepoSettings:
-    repo_url: str | None = field(default=None)
-    branch: str | None = field(default=None)
+class KlipperSettings:
+    def __init__(self) -> None:
+        self.repo_url = None
+        self.branch = None
 
 
-@dataclass
-class WebUiSettings:
-    port: str | None = field(default=None)
-    unstable_releases: bool | None = field(default=None)
+class MoonrakerSettings:
+    def __init__(self) -> None:
+        self.repo_url = None
+        self.branch = None
+
+
+class MainsailSettings:
+    def __init__(self) -> None:
+        self.port = None
+        self.unstable_releases = None
+
+
+class FluiddSettings:
+    def __init__(self) -> None:
+        self.port = None
+        self.unstable_releases = None
 
 
 # noinspection PyUnusedLocal
@@ -50,30 +61,33 @@ class KiauhSettings:
     def __new__(cls, *args, **kwargs) -> "KiauhSettings":
         if cls._instance is None:
             cls._instance = super(KiauhSettings, cls).__new__(cls, *args, **kwargs)
+            cls._instance.__initialized = False
         return cls._instance
 
-    def __repr__(self) -> str:
-        return f"KiauhSettings(kiauh={self.kiauh}, klipper={self.klipper}, moonraker={self.moonraker}, mainsail={self.mainsail}, fluidd={self.fluidd})"
-
-    def __getitem__(self, item: str) -> Any:
-        return getattr(self, item)
-
     def __init__(self) -> None:
-        if not hasattr(self, "__initialized"):
-            self.__initialized = False
         if self.__initialized:
             return
         self.__initialized = True
         self.config = SimpleConfigParser()
         self.kiauh = AppSettings()
-        self.klipper = RepoSettings()
-        self.moonraker = RepoSettings()
-        self.mainsail = WebUiSettings()
-        self.fluidd = WebUiSettings()
+        self.klipper = KlipperSettings()
+        self.moonraker = MoonrakerSettings()
+        self.mainsail = MainsailSettings()
+        self.fluidd = FluiddSettings()
+
+        self.kiauh.backup_before_update = None
+        self.klipper.repo_url = None
+        self.klipper.branch = None
+        self.moonraker.repo_url = None
+        self.moonraker.branch = None
+        self.mainsail.port = None
+        self.mainsail.unstable_releases = None
+        self.fluidd.port = None
+        self.fluidd.unstable_releases = None
 
         self._load_config()
 
-    def get(self, section: str, option: str) -> str | int | bool:
+    def get(self, section: str, option: str) -> Union[str, int, bool]:
         """
         Get a value from the settings state by providing the section and option name as strings.
         Prefer direct access to the properties, as it is usually safer!
@@ -85,12 +99,26 @@ class KiauhSettings:
         try:
             section = getattr(self, section)
             value = getattr(section, option)
-            return value  # type: ignore
+            return value
+        except AttributeError:
+            raise
+
+    def set(self, section: str, option: str, value: Union[str, int, bool]) -> None:
+        """
+        Set a value in the settings state by providing the section and option name as strings.
+        Prefer direct access to the properties, as it is usually safer!
+        :param section: The section name as string.
+        :param option: The option name as string.
+        :param value: The value to set as string, int or bool.
+        """
+        try:
+            section = getattr(self, section)
+            section.option = value
         except AttributeError:
             raise
 
     def save(self) -> None:
-        self._set_config_options_state()
+        self._set_config_options()
         self.config.write(CUSTOM_CFG)
         self._load_config()
 
@@ -102,7 +130,7 @@ class KiauhSettings:
         self.config.read(cfg)
 
         self._validate_cfg()
-        self._apply_settings_from_file()
+        self._read_settings()
 
     def _validate_cfg(self) -> None:
         try:
@@ -144,7 +172,7 @@ class KiauhSettings:
         if v.isdigit() or v.lower() == "true" or v.lower() == "false":
             raise ValueError
 
-    def _apply_settings_from_file(self) -> None:
+    def _read_settings(self):
         self.kiauh.backup_before_update = self.config.getboolean(
             "kiauh", "backup_before_update"
         )
@@ -161,7 +189,7 @@ class KiauhSettings:
             "fluidd", "unstable_releases"
         )
 
-    def _set_config_options_state(self) -> None:
+    def _set_config_options(self):
         self.config.set(
             "kiauh",
             "backup_before_update",
@@ -191,5 +219,6 @@ class KiauhSettings:
                 "● default.kiauh.cfg",
                 "● kiauh.cfg",
             ],
+            end="",
         )
         kill()

kiauh/core/spinner.py

@@ -1,61 +0,0 @@
-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/core/submodules/simple_config_parser/src/simple_config_parser/simple_config_parser.py

@@ -85,46 +85,10 @@ class DuplicateOptionError(Exception):
 class SimpleConfigParser:
     """A customized config parser targeted at handling Klipper style config files"""
 
-    # definition of section line:
-    #  - then line MUST start with an opening square bracket - it is the first section marker
-    #  - the section marker MUST be followed by at least one character - it is the section name
-    #  - the section name MUST be followed by a closing square bracket - it is the second section marker
-    #  - the second section marker MAY be followed by any amount of whitespace characters
-    #  - the second section marker MAY be followed by a # or ; - it is the comment marker
-    #  - the inline comment MAY be of any length and character
-    _SECTION_RE = re.compile(r"\[(.+)]\s*([#;].*)?$")
-
-    # definition of option line:
-    #  - the line MUST start with a word - it is the option name
-    #  - the option name MUST be followed by a colon or an equal sign - it is the separator
-    #  - the separator MUST be followed by a value
-    #    - the separator MAY have any amount of leading or trailing whitespaces
-    #    - the separator MUST NOT be directly followed by a colon or equal sign
-    #  - the value MAY be of any length and character
-    #    - the value MAY contain any amount of trailing whitespaces
-    #    - the value MAY be followed by a # or ; - it is the comment marker
-    #  - the inline comment MAY be of any length and character
-    _OPTION_RE = re.compile(r"^([^:=\s]+)\s?[:=]\s*([^=:].*)\s*([#;].*)?$")
-
-    # definition of multiline option line:
-    #  - the line MUST start with a word - it is the option name
-    #  - the option name MUST be followed by a colon or an equal sign - it is the separator
-    #  - the separator MUST NOT be followed by a value
-    #    - the separator MAY have any amount of leading or trailing whitespaces
-    #    - the separator MUST NOT be directly followed by a colon or equal sign
-    #    - the separator MAY be followed by a # or ; - it is the comment marker
-    #  - the inline comment MAY be of any length and character
-    _MLOPTION_RE = re.compile(r"^([^:=\s]+)\s*[:=]\s*([#;].*)?$")
-
-    # definition of comment line:
-    #  - the line MAY start with any amount of whitespace characters
-    #  - the line MUST contain a # or ; - it is the comment marker
-    #  - the comment marker MAY be followed by any amount of whitespace characters
-    #  - the comment MAY be of any length and character
+    _SECTION_RE = re.compile(r"\s*\[(\w+\s?.+)]\s*([#;].*)?$")
+    _OPTION_RE = re.compile(r"^\s*(\w+)\s*[:=]\s*([^=:].*)\s*([#;].*)?$")
+    _MLOPTION_RE = re.compile(r"^\s*(\w+)\s*[:=]\s*([#;].*)?$")
     _COMMENT_RE = re.compile(r"^\s*([#;].*)?$")
-
-    # definition of empty line:
-    #  - the line MUST contain only whitespace characters
     _EMPTY_LINE_RE = re.compile(r"^\s*$")
 
     BOOLEAN_STATES = {

kiauh/core/submodules/simple_config_parser/tests/features/line_parsing/data/case_parse_option.py

@@ -21,8 +21,4 @@ testcases = [
         "serial",
         "/dev/serial/by-id/<your-mcu-id>",
     ),
-    ("parameter_temperature_(°C): 155", "parameter_temperature_(°C)", "155"),
-    ("parameter_humidity_(%_RH): 45", "parameter_humidity_(%_RH)", "45"),
-    ("parameter_spool_weight_(%): 10", "parameter_spool_weight_(%)", "10"),
-    ("path: /dev/shm/drying_box.json", "path", "/dev/shm/drying_box.json"),
 ]

kiauh/core/submodules/simple_config_parser/tests/features/line_parsing/test_line_parsing.py

@@ -14,7 +14,7 @@ def parser():
     return SimpleConfigParser()
 
 
-class TestSingleLineParsing:
+class TestLineParsing:
     @pytest.mark.parametrize("given, expected", [*case_parse_section])
     def test_parse_section(self, parser, given, expected):
         parser._parse_section(given)

kiauh/core/submodules/simple_config_parser/tests/features/line_type_detection/data/case_line_is_multiline_option.py

@@ -14,14 +14,4 @@ testcases = [
     ("", False),
     ("# that's a comment", False),
     ("; that's a comment", False),
-    ("parameter_humidity_(%_RH):", True),
-    ("parameter_spool_weight_(%):", True),
-    ("parameter_temperature_(°C):", True),
-    ("parameter_humidity_(%_RH): 18.123", False),
-    ("parameter_spool_weight_(%): 150", False),
-    ("parameter_temperature_(°C): 30,5", False),
-    ("trusted_clients:", True),
-    ("trusted_clients: 192.168.1.0/24", False),
-    ("cors_domains:", True),
-    ("cors_domains: http://*.lan", False),
 ]

kiauh/core/submodules/simple_config_parser/tests/features/line_type_detection/data/case_line_is_option.py

@@ -26,6 +26,5 @@ testcases = [
     ("description: homing!", True),
     ("description: inline macro :-)", True),
     ("path: %GCODES_DIR%", True),
-    ("path: /dev/shm/drying_box.json", True),
     ("serial = /dev/serial/by-id/<your-mcu-id>", True),
 ]

kiauh/extensions/extensions_menu.py

@@ -6,39 +6,42 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import importlib
 import inspect
 import json
 import textwrap
 from pathlib import Path
-from typing import Dict, List, Type
+from typing import Dict, List, Optional, 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.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
+from utils.logger import Logger
 
 
 # noinspection PyUnusedLocal
 # noinspection PyMethodMayBeStatic
 class ExtensionsMenu(BaseMenu):
-    def __init__(self, previous_menu: Type[BaseMenu] | None = None):
+    def __init__(self, previous_menu: Optional[Type[BaseMenu]] = None):
         super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
+        self.previous_menu = previous_menu
         self.extensions: Dict[str, BaseExtension] = self.discover_extensions()
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         from core.menus.main_menu import MainMenu
 
-        self.previous_menu = previous_menu if previous_menu is not None else MainMenu
+        self.previous_menu: Type[BaseMenu] = (
+            previous_menu if previous_menu is not None else MainMenu
+        )
 
     def set_options(self) -> None:
         self.options = {
-            i: Option(self.extension_submenu, opt_data=self.extensions.get(i))
+            i: Option(
+                self.extension_submenu, menu=True, opt_data=self.extensions.get(i)
+            )
             for i in self.extensions
         }
 
@@ -77,7 +80,7 @@ class ExtensionsMenu(BaseMenu):
     def extension_submenu(self, **kwargs):
         ExtensionSubmenu(kwargs.get("opt_data"), self.__class__).run()
 
-    def print_menu(self) -> None:
+    def print_menu(self):
         header = " [ Extensions Menu ] "
         color = COLOR_CYAN
         line1 = f"{COLOR_YELLOW}Available Extensions:{RESET_FORMAT}"
@@ -105,24 +108,24 @@ class ExtensionsMenu(BaseMenu):
 # noinspection PyMethodMayBeStatic
 class ExtensionSubmenu(BaseMenu):
     def __init__(
-        self, extension: BaseExtension, previous_menu: Type[BaseMenu] | None = None
+        self, extension: BaseExtension, previous_menu: Optional[Type[BaseMenu]] = None
     ):
         super().__init__()
         self.extension = extension
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
+        self.previous_menu = previous_menu
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
-        self.previous_menu = (
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
+        self.previous_menu: Type[BaseMenu] = (
             previous_menu if previous_menu is not None else ExtensionsMenu
         )
 
     def set_options(self) -> None:
-        self.options["1"] = Option(self.extension.install_extension)
+        self.options["1"] = Option(self.extension.install_extension, menu=False)
         if self.extension.metadata.get("updates"):
-            self.options["2"] = Option(self.extension.update_extension)
-            self.options["3"] = Option(self.extension.remove_extension)
+            self.options["2"] = Option(self.extension.update_extension, menu=False)
+            self.options["3"] = Option(self.extension.remove_extension, menu=False)
         else:
-            self.options["2"] = Option(self.extension.remove_extension)
+            self.options["2"] = Option(self.extension.remove_extension, menu=False)
 
     def print_menu(self) -> None:
         header = f" [ {self.extension.metadata.get('display_name')} ] "

kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py

@@ -14,7 +14,6 @@ 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,
 )
@@ -28,7 +27,7 @@ from extensions.gcode_shell_cmd import (
 )
 from utils.fs_utils import check_file_exist
 from utils.input_utils import get_confirm
-from utils.instance_utils import get_instances
+from utils.logger import Logger
 
 
 # noinspection PyMethodMayBeStatic
@@ -56,8 +55,8 @@ class GcodeShellCmdExtension(BaseExtension):
             Logger.print_warn("Installation aborted due to user request.")
             return
 
-        instances = get_instances(Klipper)
-        InstanceManager.stop_all(instances)
+        im = InstanceManager(Klipper)
+        im.stop_all_instance()
 
         try:
             Logger.print_status(f"Copy extension to '{KLIPPER_EXTRAS}' ...")
@@ -67,9 +66,9 @@ class GcodeShellCmdExtension(BaseExtension):
             return
 
         if install_example:
-            self.install_example_cfg(instances)
+            self.install_example_cfg(im.instances)
 
-        InstanceManager.start_all(instances)
+        im.start_all_instance()
 
         Logger.print_ok("Installing G-Code Shell Command extension successful!")
 
@@ -95,7 +94,7 @@ class GcodeShellCmdExtension(BaseExtension):
             Logger.print_warn("Make sure to remove them from the printer.cfg!")
 
     def install_example_cfg(self, instances: List[Klipper]):
-        cfg_dirs = [instance.base.cfg_dir for instance in instances]
+        cfg_dirs = [instance.cfg_dir for instance in instances]
         # copy extension to klippy/extras
         for cfg_dir in cfg_dirs:
             Logger.print_status(f"Create shell_command.cfg in '{cfg_dir}' ...")

kiauh/extensions/klipper_backup/klipper_backup_extension.py

@@ -12,9 +12,7 @@
 import os
 import shutil
 import subprocess
-from core.constants import SYSTEMD
-from core.logger import Logger
-from pathlib import Path
+
 from extensions.base_extension import BaseExtension
 from extensions.klipper_backup import (
     KLIPPERBACKUP_CONFIG_DIR,
@@ -22,106 +20,163 @@ from extensions.klipper_backup import (
     KLIPPERBACKUP_REPO_URL,
     MOONRAKER_CONF,
 )
-from utils.fs_utils import check_file_exist, remove_with_sudo
-from utils.git_utils import git_cmd_clone
+from utils.fs_utils import check_file_exist
 from utils.input_utils import get_confirm
-from utils.sys_utils import cmd_sysctl_manage, remove_system_service, unit_file_exists
+from utils.logger import Logger
+from utils.sys_utils import service_instance_exists
 
 
+# noinspection PyMethodMayBeStatic
 class KlipperbackupExtension(BaseExtension):
-
-    def remove_extension(self, **kwargs) -> None:
-        if not check_file_exist(KLIPPERBACKUP_DIR):
-            Logger.print_info("Extension does not seem to be installed! Skipping ...")
-            return
-
-        def uninstall_service(service_name: str, unit_type: str) -> bool:
-            try:
-                full_service_name = f"{service_name}.{unit_type}"
-                if unit_type == "service":
-                    remove_system_service(full_service_name)
-                elif unit_type == "timer":
-                    full_service_path: Path = SYSTEMD.joinpath(full_service_name)
-                    Logger.print_status(f"Removing {full_service_name} ...")
-                    remove_with_sudo(full_service_path)
-                    Logger.print_ok(f"{service_name}.{unit_type} successfully removed!")
-                    cmd_sysctl_manage("daemon-reload")
-                    cmd_sysctl_manage("reset-failed")
-                else:
-                    Logger.print_error(f"Unknown unit type {unit_type} of {full_service_name}")
-            except:
-                Logger.print_error(f"Failed to remove {full_service_name}: {str(e)}")
-
-        def check_crontab_entry(entry) -> bool:
-            try:
-                crontab_content = subprocess.check_output(["crontab", "-l"], stderr=subprocess.DEVNULL, text=True)
-            except subprocess.CalledProcessError:
-                return False
-            return any(entry in line for line in crontab_content.splitlines())
-
-        def remove_moonraker_entry():
-            original_file_path = MOONRAKER_CONF
-            comparison_file_path = os.path.join(str(KLIPPERBACKUP_DIR), "install-files", "moonraker.conf")
-            if not (os.path.exists(original_file_path) and os.path.exists(comparison_file_path)):
-                return False
-            with open(original_file_path, "r") as original_file, open(comparison_file_path, "r") as comparison_file:
-                original_content = original_file.read()
-                comparison_content = comparison_file.read()
-            if comparison_content in original_content:
-                Logger.print_status("Removing Klipper-Backup moonraker entry ...")
-                modified_content = original_content.replace(comparison_content, "").strip()
-                modified_content = "\n".join(line for line in modified_content.split("\n") if line.strip())
-                with open(original_file_path, "w") as original_file:
-                    original_file.write(modified_content)
-                Logger.print_ok("Klipper-Backup moonraker entry successfully removed!")
-                return True
-            return False
-
-        if get_confirm("Do you really want to remove the extension?", True, False):
-            # Remove systemd timer and services
-            service_names = ["klipper-backup-on-boot", "klipper-backup-filewatch", "klipper-backup"]
-            unit_types = ["timer", "service"]
-
-            for service_name in service_names:
-                for unit_type in unit_types:
-                    if unit_file_exists(service_name, unit_type):
-                        uninstall_service(service_name, unit_type)
-
-            # Remnove crontab entry
-            try:
-                if check_crontab_entry("/klipper-backup/script.sh"):
-                    Logger.print_status("Removing Klipper-Backup crontab entry ...")
-                    crontab_content = subprocess.check_output(["crontab", "-l"], text=True)
-                    modified_content = "\n".join(line for line in crontab_content.splitlines() if "/klipper-backup/script.sh" not in line)
-                    subprocess.run(["crontab", "-"], input=modified_content + "\n", text=True, check=True)
-                    Logger.print_ok("Klipper-Backup crontab entry successfully removed!")
-            except subprocess.CalledProcessError:
-                Logger.print_error("Unable to remove the Klipper-Backup cron entry")
-
-            # Remove moonraker entry
-            try:
-                remove_moonraker_entry()
-            except:
-                Logger.print_error("Unable to remove the Klipper-Backup moonraker entry")
-
-            # Remove Klipper-backup extension
-            Logger.print_status("Removing Klipper-Backup extension ...")
-            try:
-                remove_with_sudo(KLIPPERBACKUP_DIR)
-                if check_file_exist(KLIPPERBACKUP_CONFIG_DIR):
-                    remove_with_sudo(KLIPPERBACKUP_CONFIG_DIR)
-                Logger.print_ok("Extension Klipper-Backup successfully removed!")
-            except:
-                Logger.print_error(f"Unable to remove Klipper-Backup extension")
-
     def install_extension(self, **kwargs) -> None:
         if not KLIPPERBACKUP_DIR.exists():
-            git_cmd_clone(KLIPPERBACKUP_REPO_URL, KLIPPERBACKUP_DIR)
+            subprocess.run(
+                ["git", "clone", str(KLIPPERBACKUP_REPO_URL), str(KLIPPERBACKUP_DIR)]
+            )
             subprocess.run(["chmod", "+x", str(KLIPPERBACKUP_DIR / "install.sh")])
         subprocess.run([str(KLIPPERBACKUP_DIR / "install.sh")])
 
     def update_extension(self, **kwargs) -> None:
-        if not check_file_exist(KLIPPERBACKUP_DIR):
+        extension_installed = check_file_exist(KLIPPERBACKUP_DIR)
+        if not extension_installed:
             Logger.print_info("Extension does not seem to be installed! Skipping ...")
             return
-        subprocess.run([str(KLIPPERBACKUP_DIR / "install.sh"), "check_updates"])
+        else:
+            subprocess.run([str(KLIPPERBACKUP_DIR / "install.sh"), "check_updates"])
+
+    def remove_extension(self, **kwargs) -> None:
+
+        def uninstall_service(service_name):
+            try:
+                subprocess.run(["sudo", "systemctl", "stop", service_name], check=True)
+                subprocess.run(
+                    ["sudo", "systemctl", "disable", service_name], check=True
+                )
+                subprocess.run(["sudo", "systemctl", "daemon-reload"], check=True)
+                service_path = f"/etc/systemd/system/{service_name}.service"
+                os.system(f"sudo rm {service_path}")
+                return True
+            except subprocess.CalledProcessError:
+                return False
+
+        def check_crontab_entry(entry):
+            try:
+                crontab_content = subprocess.check_output(
+                    ["crontab", "-l"], stderr=subprocess.DEVNULL, text=True
+                )
+            except subprocess.CalledProcessError:
+                return False
+            for line in crontab_content.splitlines():
+                if entry in line:
+                    return True
+            return False
+
+        extension_installed = check_file_exist(KLIPPERBACKUP_DIR)
+        if not extension_installed:
+            Logger.print_info("Extension does not seem to be installed! Skipping ...")
+            return
+
+        def remove_moonraker_entry():
+            original_file_path = MOONRAKER_CONF
+            comparison_file_path = os.path.join(
+                str(KLIPPERBACKUP_DIR), "install-files", "moonraker.conf"
+            )
+            if not os.path.exists(original_file_path) or not os.path.exists(
+                comparison_file_path
+            ):
+                return False
+            with open(original_file_path, "r") as original_file, open(
+                comparison_file_path, "r"
+            ) as comparison_file:
+                original_content = original_file.read()
+                comparison_content = comparison_file.read()
+            if comparison_content in original_content:
+                modified_content = original_content.replace(
+                    comparison_content, ""
+                ).strip()
+                modified_content = "\n".join(
+                    line for line in modified_content.split("\n") if line.strip()
+                )
+                with open(original_file_path, "w") as original_file:
+                    original_file.write(modified_content)
+                    return True
+            else:
+                return False
+
+        question = "Do you really want to remove the extension?"
+        if get_confirm(question, True, False):
+            # Remove Klipper-Backup services
+            service_names = [
+                "klipper-backup-on-boot",
+                "klipper-backup-filewatch",
+            ]
+            for service_name in service_names:
+                try:
+                    Logger.print_status(
+                        f"Check whether the {service_name} service is installed ..."
+                    )
+                    if service_instance_exists(service_name):
+                        Logger.print_info(f"Service {service_name} detected.")
+                        if uninstall_service(service_name):
+                            Logger.print_ok(
+                                f"The {service_name} service has been successfully uninstalled."
+                            )
+                        else:
+                            Logger.print_error(
+                               f"Error uninstalling the {service_name} service."
+                           )
+                    else:
+                        Logger.print_info(f"Service {service_name} NOT detected.")
+                except:
+                    Logger.print_error(f"Unable to remove the {service_name} service")
+
+            # Remove Klipper-Backup cron
+            Logger.print_status("Check for Klipper-Backup cron entry ...")
+            entry_to_check = "/klipper-backup/script.sh"
+            try:
+                if check_crontab_entry(entry_to_check):
+                    crontab_content = subprocess.check_output(
+                        ["crontab", "-l"], text=True
+                    )
+                    modified_content = "\n".join(
+                        line
+                        for line in crontab_content.splitlines()
+                        if entry_to_check not in line
+                    )
+                    subprocess.run(
+                        ["crontab", "-"], input=modified_content, text=True, check=True
+                    )
+                    Logger.print_ok(
+                        "The Klipper-Backup entry has been removed from the crontab."
+                    )
+                else:
+                    Logger.print_info(
+                        "The Klipper-Backup entry is not present in the crontab. Skipping ..."
+                    )
+            except:
+                Logger.print_error("Unable to remove the Klipper-Backup cron entry")
+
+            # Remove Moonraker entry
+            Logger.print_status("Check for Klipper-Backup moonraker entry ...")
+            try:
+                if remove_moonraker_entry():
+                    Logger.print_ok("Klipper-Backup entry in moonraker.conf removed")
+                else:
+                    Logger.print_info(
+                        "Klipper-Backup entry not found in moonraker.conf. Skipping ..."
+                    )
+            except:
+                Logger.print_error(
+                    "Unknown error, either the moonraker.conf is not found or the Klipper-Backup entry under ~/klipper-backup/install-files/moonraker.conf. Skipping ..."
+                )
+
+            # Remove Klipper-Backup
+            Logger.print_status(f"Removing '{KLIPPERBACKUP_DIR}' ...")
+            try:
+                shutil.rmtree(KLIPPERBACKUP_DIR)
+                config_backup_exists = check_file_exist(KLIPPERBACKUP_CONFIG_DIR)
+                if config_backup_exists:
+                    shutil.rmtree(KLIPPERBACKUP_CONFIG_DIR)
+                Logger.print_ok("Extension Klipper-Backup successfully removed!")
+            except OSError as e:
+                Logger.print_error(f"Unable to remove extension: {e}")

kiauh/extensions/mainsail_theme_installer/mainsail_theme_installer_extension.py

@@ -6,34 +6,30 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import csv
 import shutil
 import textwrap
 import urllib.request
-from dataclasses import dataclass
-from typing import Any, Dict, List, Type, Union
+from typing import List, Optional, Type, TypedDict, Union
 
 from components.klipper.klipper import Klipper
 from components.klipper.klipper_dialogs import (
     DisplayType,
     print_instance_overview,
 )
-from core.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 from core.instance_manager.base_instance import BaseInstance
-from core.instance_type import InstanceType
-from core.logger import Logger
+from core.instance_manager.instance_manager import InstanceManager
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
 from extensions.base_extension import BaseExtension
+from utils.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 from utils.git_utils import git_clone_wrapper
 from utils.input_utils import get_selection_input
-from utils.instance_utils import get_instances
+from utils.logger import Logger
 
 
-@dataclass
-class ThemeData:
+class ThemeData(TypedDict):
     name: str
     short_note: str
     author: str
@@ -42,7 +38,8 @@ class ThemeData:
 
 # noinspection PyMethodMayBeStatic
 class MainsailThemeInstallerExtension(BaseExtension):
-    instances: List[Klipper] = get_instances(Klipper)
+    im = InstanceManager(Klipper)
+    instances: List[Klipper] = im.instances
 
     def install_extension(self, **kwargs) -> None:
         MainsailThemeInstallMenu(self.instances).run()
@@ -84,16 +81,16 @@ class MainsailThemeInstallMenu(BaseMenu):
         self.themes: List[ThemeData] = self.load_themes()
         self.instances = instances
 
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
+    def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
         from extensions.extensions_menu import ExtensionsMenu
 
-        self.previous_menu = (
+        self.previous_menu: Type[BaseMenu] = (
             previous_menu if previous_menu is not None else ExtensionsMenu
         )
 
     def set_options(self) -> None:
         self.options = {
-            f"{index}": Option(self.install_theme, opt_index=f"{index}")
+            f"{index}": Option(self.install_theme, False, opt_index=f"{index}")
             for index in range(len(self.themes))
         }
 
@@ -104,45 +101,36 @@ class MainsailThemeInstallMenu(BaseMenu):
         count = 62 - len(color) - len(RESET_FORMAT)
         menu = textwrap.dedent(
             f"""
-            ╔═══════════════════════════════════════════════════════╗
-            ║ {color}{header:~^{count}}{RESET_FORMAT} ║
-            ╟───────────────────────────────────────────────────────╢
-            ║ {line1:<62} ║
-            ║ https://docs.mainsail.xyz/theming/themes              ║
-            ╟───────────────────────────────────────────────────────╢
+            /=======================================================\\
+            | {color}{header:~^{count}}{RESET_FORMAT} |
+            |-------------------------------------------------------|
+            | {line1:<62} |
+            | https://docs.mainsail.xyz/theming/themes              |
+            |-------------------------------------------------------|
             """
         )[1:]
         for i, theme in enumerate(self.themes):
-            j: str = f" {i}" if i < 10 else f"{i}"
-            row: str = f"{j}) [{theme.name}]"
-            menu += f"║ {row:<53} ║\n"
+            i = f" {i}" if i < 10 else f"{i}"
+            row = f"{i}) [{theme.get('name')}]"
+            menu += f"| {row:<53} |\n"
         print(menu, end="")
 
     def load_themes(self) -> List[ThemeData]:
         with urllib.request.urlopen(self.THEMES_URL) as response:
             themes: List[ThemeData] = []
-            content: str = response.read().decode()
-            csv_data: List[str] = content.splitlines()
-            fieldnames = ["name", "short_note", "author", "repo"]
-            csv_reader = csv.DictReader(csv_data, fieldnames=fieldnames, delimiter=",")
-            next(csv_reader)  # skip the header of the csv file
+            csv_data: str = response.read().decode().splitlines()
+            csv_reader = csv.DictReader(csv_data, delimiter=",")
             for row in csv_reader:
-                row: Dict[str, str]  # type: ignore
-                theme: ThemeData = ThemeData(**row)
-                themes.append(theme)
+                row: ThemeData = row
+                themes.append(row)
 
         return themes
 
-    def install_theme(self, **kwargs: Any):
-        opt_index: str | None = kwargs.get("opt_index", None)
-
-        if not opt_index:
-            raise ValueError("No option index provided")
-
-        index: int = int(opt_index)
+    def install_theme(self, **kwargs):
+        index = int(kwargs.get("opt_index"))
         theme_data: ThemeData = self.themes[index]
-        theme_author: str = theme_data.author
-        theme_repo: str = theme_data.repo
+        theme_author: str = theme_data.get("author")
+        theme_repo: str = theme_data.get("repo")
         theme_repo_url: str = f"https://github.com/{theme_author}/{theme_repo}"
 
         print_instance_overview(
@@ -160,16 +148,16 @@ class MainsailThemeInstallMenu(BaseMenu):
         for printer in printer_list:
             git_clone_wrapper(theme_repo_url, printer.cfg_dir.joinpath(".theme"))
 
-        if len(theme_data.short_note) > 1:
+        if len(theme_data.get("short_note", "")) > 1:
             Logger.print_warn("Info from the creator:", prefix=False, start="\n")
-            Logger.print_info(theme_data.short_note, prefix=False, end="\n\n")
+            Logger.print_info(theme_data.get("short_note"), prefix=False, end="\n\n")
 
 
 def get_printer_selection(
-    instances: List[InstanceType], is_install: bool
+    instances: List[BaseInstance], is_install: bool
 ) -> Union[List[BaseInstance], None]:
     options = [str(i) for i in range(len(instances))]
-    options.extend(["a", "b"])
+    options.extend(["a", "A", "b", "B"])
 
     if is_install:
         q = "Select the printer to install the theme for"
@@ -178,9 +166,9 @@ def get_printer_selection(
     selection = get_selection_input(q, options)
 
     install_for = []
-    if selection == "b":
+    if selection == "b".lower():
         return None
-    elif selection == "a":
+    elif selection == "a".lower():
         install_for.extend(instances)
     else:
         instance = instances[int(selection)]

kiauh/extensions/obico/__init__.py

@@ -1,34 +0,0 @@
-# ======================================================================= #
-#  Copyright (C) 2020 - 2024 Dominik Willner <th33xitus@gmail.com>        #
-#                                                                         #
-#  This file is part of KIAUH - Klipper Installation And Update Helper    #
-#  https://github.com/dw-0/kiauh                                          #
-#                                                                         #
-#  This file may be distributed under the terms of the GNU GPLv3 license  #
-# ======================================================================= #
-from pathlib import Path
-
-MODULE_PATH = Path(__file__).resolve().parent
-
-# repo
-OBICO_REPO = "https://github.com/TheSpaghettiDetective/moonraker-obico.git"
-
-# names
-OBICO_SERVICE_NAME = "moonraker-obico.service"
-OBICO_ENV_FILE_NAME = "moonraker-obico.env"
-OBICO_CFG_NAME = "moonraker-obico.cfg"
-OBICO_CFG_SAMPLE_NAME = "moonraker-obico.cfg.sample"
-OBICO_LOG_NAME = "moonraker-obico.log"
-OBICO_UPDATE_CFG_NAME = "moonraker-obico-update.cfg"
-OBICO_UPDATE_CFG_SAMPLE_NAME = "moonraker-obico-update.cfg.sample"
-OBICO_MACROS_CFG_NAME = "moonraker_obico_macros.cfg"
-
-# directories
-OBICO_DIR = Path.home().joinpath("moonraker-obico")
-OBICO_ENV_DIR = Path.home().joinpath("moonraker-obico-env")
-
-# files
-OBICO_SERVICE_TEMPLATE = MODULE_PATH.joinpath(f"assets/{OBICO_SERVICE_NAME}")
-OBICO_ENV_FILE_TEMPLATE = MODULE_PATH.joinpath(f"assets/{OBICO_ENV_FILE_NAME}")
-OBICO_LINK_SCRIPT = OBICO_DIR.joinpath("scripts/link.sh")
-OBICO_REQ_FILE = OBICO_DIR.joinpath("requirements.txt")

kiauh/extensions/obico/moonraker_obico.py

@@ -6,86 +6,130 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
-from dataclasses import dataclass, field
 from pathlib import Path
-from subprocess import CalledProcessError, run
+from subprocess import DEVNULL, CalledProcessError, run
+from typing import List
 
-from components.moonraker.moonraker import Moonraker
-from core.constants import CURRENT_USER
 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 extensions.obico import (
-    OBICO_CFG_NAME,
-    OBICO_DIR,
-    OBICO_ENV_DIR,
-    OBICO_ENV_FILE_NAME,
-    OBICO_ENV_FILE_TEMPLATE,
-    OBICO_LINK_SCRIPT,
-    OBICO_LOG_NAME,
-    OBICO_SERVICE_TEMPLATE,
-)
-from utils.fs_utils import create_folders
-from utils.sys_utils import get_service_file_path
+from utils.constants import SYSTEMD
+from utils.logger import Logger
+
+MODULE_PATH = Path(__file__).resolve().parent
+
+OBICO_DIR = Path.home().joinpath("moonraker-obico")
+OBICO_ENV = Path.home().joinpath("moonraker-obico-env")
+OBICO_REPO = "https://github.com/TheSpaghettiDetective/moonraker-obico.git"
+
+OBICO_CFG = "moonraker-obico.cfg"
+OBICO_CFG_SAMPLE = "moonraker-obico.cfg.sample"
+OBICO_LOG = "moonraker-obico.log"
+OBICO_UPDATE_CFG = "moonraker-obico-update.cfg"
+OBICO_UPDATE_CFG_SAMPLE = "moonraker-obico-update.cfg.sample"
+OBICO_MACROS_CFG = "moonraker_obico_macros.cfg"
 
 
 # noinspection PyMethodMayBeStatic
-@dataclass(repr=True)
-class MoonrakerObico:
-    suffix: str
-    base: BaseInstance = field(init=False, repr=False)
-    service_file_path: Path = field(init=False)
-    log_file_name: str = OBICO_LOG_NAME
-    dir: Path = OBICO_DIR
-    env_dir: Path = OBICO_ENV_DIR
-    data_dir: Path = field(init=False)
-    cfg_file: Path = field(init=False)
-    is_linked: bool = False
+class MoonrakerObico(BaseInstance):
+    @classmethod
+    def blacklist(cls) -> List[str]:
+        return ["None", "mcu"]
 
-    def __post_init__(self):
-        self.base: BaseInstance = BaseInstance(Moonraker, self.suffix)
-        self.base.log_file_name = self.log_file_name
+    def __init__(self, suffix: str = ""):
+        super().__init__(instance_type=self, suffix=suffix)
+        self.dir: Path = OBICO_DIR
+        self.env_dir: Path = OBICO_ENV
+        self._cfg_file = self.cfg_dir.joinpath("moonraker-obico.cfg")
+        self._log = self.log_dir.joinpath("moonraker-obico.log")
+        self._is_linked: bool = self._check_link_status()
+        self._assets_dir = MODULE_PATH.joinpath("assets")
 
-        self.service_file_path: Path = get_service_file_path(
-            MoonrakerObico, self.suffix
-        )
-        self.data_dir: Path = self.base.data_dir
-        self.cfg_file = self.base.cfg_dir.joinpath(OBICO_CFG_NAME)
-        self.is_linked: bool = self._check_link_status()
+    @property
+    def cfg_file(self) -> Path:
+        return self._cfg_file
+
+    @property
+    def log(self) -> Path:
+        return self._log
+
+    @property
+    def is_linked(self) -> bool:
+        return self._is_linked
 
     def create(self) -> None:
-        from utils.sys_utils import create_env_file, create_service_file
-
         Logger.print_status("Creating new Obico for Klipper Instance ...")
+        service_template_path = MODULE_PATH.joinpath("assets/moonraker-obico.service")
+        service_file_name = self.get_service_file_name(extension=True)
+        service_file_target = SYSTEMD.joinpath(service_file_name)
+        env_template_file_path = MODULE_PATH.joinpath("assets/moonraker-obico.env")
+        env_file_target = self.sysd_dir.joinpath("moonraker-obico.env")
 
         try:
-            create_folders(self.base.base_folders)
-            create_service_file(
-                name=self.service_file_path.name,
-                content=self._prep_service_file_content(),
-            )
-            create_env_file(
-                path=self.base.sysd_dir.joinpath(OBICO_ENV_FILE_NAME),
-                content=self._prep_env_file_content(),
+            self.create_folders()
+            self.write_service_file(
+                service_template_path, service_file_target, env_file_target
             )
+            self.write_env_file(env_template_file_path, env_file_target)
 
         except CalledProcessError as e:
-            Logger.print_error(f"Error creating instance: {e}")
+            Logger.print_error(
+                f"Error creating service file {service_file_target}: {e}"
+            )
             raise
         except OSError as e:
-            Logger.print_error(f"Error creating env file: {e}")
+            Logger.print_error(f"Error creating env file {env_file_target}: {e}")
             raise
 
+    def delete(self) -> None:
+        service_file = self.get_service_file_name(extension=True)
+        service_file_path = self.get_service_file_path()
+
+        Logger.print_status(f"Deleting Obico for Klipper Instance: {service_file}")
+
+        try:
+            command = ["sudo", "rm", "-f", service_file_path]
+            run(command, check=True)
+            Logger.print_ok(f"Service file deleted: {service_file_path}")
+        except CalledProcessError as e:
+            Logger.print_error(f"Error deleting service file: {e}")
+            raise
+
+    def write_service_file(
+        self,
+        service_template_path: Path,
+        service_file_target: Path,
+        env_file_target: Path,
+    ) -> None:
+        service_content = self._prep_service_file(
+            service_template_path, env_file_target
+        )
+        command = ["sudo", "tee", service_file_target]
+        run(
+            command,
+            input=service_content.encode(),
+            stdout=DEVNULL,
+            check=True,
+        )
+        Logger.print_ok(f"Service file created: {service_file_target}")
+
+    def write_env_file(
+        self, env_template_file_path: Path, env_file_target: Path
+    ) -> None:
+        env_file_content = self._prep_env_file(env_template_file_path)
+        with open(env_file_target, "w") as env_file:
+            env_file.write(env_file_content)
+        Logger.print_ok(f"Env file created: {env_file_target}")
+
     def link(self) -> None:
         Logger.print_status(
-            f"Linking instance for printer {self.data_dir.name} to the Obico server ..."
+            f"Linking instance for printer {self.data_dir_name} to the Obico server ..."
         )
         try:
-            cmd = [f"{OBICO_LINK_SCRIPT} -q -c {self.cfg_file}"]
+            script = OBICO_DIR.joinpath("scripts/link.sh")
+            cmd = [f"{script} -q -c {self.cfg_file}"]
             if self.suffix:
                 cmd.append(f"-n {self.suffix}")
             run(cmd, check=True, shell=True)
@@ -93,51 +137,40 @@ class MoonrakerObico:
             Logger.print_error(f"Error during Obico linking: {e}")
             raise
 
-    def _prep_service_file_content(self) -> str:
-        template = OBICO_SERVICE_TEMPLATE
-
+    def _prep_service_file(
+        self, service_template_path: Path, env_file_path: Path
+    ) -> str:
         try:
-            with open(template, "r") as template_file:
+            with open(service_template_path, "r") as template_file:
                 template_content = template_file.read()
         except FileNotFoundError:
-            Logger.print_error(f"Unable to open {template} - File not found")
+            Logger.print_error(
+                f"Unable to open {service_template_path} - File not found"
+            )
             raise
-
-        service_content = template_content.replace(
-            "%USER%",
-            CURRENT_USER,
-        )
-        service_content = service_content.replace(
-            "%OBICO_DIR%",
-            self.dir.as_posix(),
-        )
-        service_content = service_content.replace(
-            "%ENV%",
-            self.env_dir.as_posix(),
-        )
-        service_content = service_content.replace(
-            "%ENV_FILE%",
-            self.base.sysd_dir.joinpath(OBICO_ENV_FILE_NAME).as_posix(),
-        )
+        service_content = template_content.replace("%USER%", self.user)
+        service_content = service_content.replace("%OBICO_DIR%", str(self.dir))
+        service_content = service_content.replace("%ENV%", str(self.env_dir))
+        service_content = service_content.replace("%ENV_FILE%", str(env_file_path))
         return service_content
 
-    def _prep_env_file_content(self) -> str:
-        template = OBICO_ENV_FILE_TEMPLATE
-
+    def _prep_env_file(self, env_template_file_path: Path) -> str:
         try:
-            with open(template, "r") as env_file:
+            with open(env_template_file_path, "r") as env_file:
                 env_template_file_content = env_file.read()
         except FileNotFoundError:
-            Logger.print_error(f"Unable to open {template} - File not found")
+            Logger.print_error(
+                f"Unable to open {env_template_file_path} - File not found"
+            )
             raise
         env_file_content = env_template_file_content.replace(
             "%CFG%",
-            f"{self.base.cfg_dir}/{self.cfg_file}",
+            f"{self.cfg_dir}/{self.cfg_file}",
         )
         return env_file_content
 
     def _check_link_status(self) -> bool:
-        if not self.cfg_file or not self.cfg_file.exists():
+        if not self.cfg_file.exists():
             return False
 
         scp = SimpleConfigParser()

kiauh/extensions/obico/moonraker_obico_extension.py

@@ -12,22 +12,19 @@ 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,
 )
 from extensions.base_extension import BaseExtension
-from extensions.obico import (
-    OBICO_CFG_SAMPLE_NAME,
-    OBICO_DIR,
-    OBICO_ENV_DIR,
-    OBICO_MACROS_CFG_NAME,
-    OBICO_REPO,
-    OBICO_REQ_FILE,
-    OBICO_UPDATE_CFG_NAME,
-    OBICO_UPDATE_CFG_SAMPLE_NAME,
-)
 from extensions.obico.moonraker_obico import (
+    OBICO_CFG_SAMPLE,
+    OBICO_DIR,
+    OBICO_ENV,
+    OBICO_LOG,
+    OBICO_MACROS_CFG,
+    OBICO_REPO,
+    OBICO_UPDATE_CFG,
+    OBICO_UPDATE_CFG_SAMPLE,
     MoonrakerObico,
 )
 from utils.common import check_install_dependencies, moonraker_exists
@@ -35,13 +32,12 @@ from utils.config_utils import (
     add_config_section,
     remove_config_section,
 )
-from utils.fs_utils import run_remove_routines
+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, get_selection_input, get_string_input
-from utils.instance_utils import get_instances
+from utils.logger import DialogType, Logger
 from utils.sys_utils import (
     cmd_sysctl_manage,
-    cmd_sysctl_service,
     create_python_venv,
     install_python_requirements,
     parse_packages_from_file,
@@ -61,11 +57,11 @@ class ObicoExtension(BaseExtension):
 
         # if obico is already installed, ask if the user wants to repair an
         # incomplete installation or link to the obico server
-        force_clone = False
-        obico_instances: List[MoonrakerObico] = get_instances(MoonrakerObico)
+        obico_im = InstanceManager(MoonrakerObico)
+        obico_instances: List[MoonrakerObico] = obico_im.instances
         if obico_instances:
             self._print_is_already_installed()
-            options = ["l", "r", "b"]
+            options = ["l", "L", "r", "R", "b", "B"]
             action = get_selection_input("Perform action", option_list=options)
             if action.lower() == "b":
                 Logger.print_info("Exiting Obico for Klipper installation ...")
@@ -78,11 +74,12 @@ class ObicoExtension(BaseExtension):
                 return
             else:
                 Logger.print_status("Re-Installing Obico for Klipper ...")
-                force_clone = True
 
         # let the user confirm installation
-        kl_instances: List[Klipper] = get_instances(Klipper)
-        mr_instances: List[Moonraker] = get_instances(Moonraker)
+        kl_im = InstanceManager(Klipper)
+        kl_instances: List[Klipper] = kl_im.instances
+        mr_im = InstanceManager(Moonraker)
+        mr_instances: List[Moonraker] = mr_im.instances
         self._print_moonraker_instances(mr_instances)
         if not get_confirm(
             "Continue Obico for Klipper installation?",
@@ -92,7 +89,7 @@ class ObicoExtension(BaseExtension):
             return
 
         try:
-            git_clone_wrapper(OBICO_REPO, OBICO_DIR, force=force_clone)
+            git_clone_wrapper(OBICO_REPO, OBICO_DIR)
             self._install_dependencies()
 
             # ask the user for the obico server url
@@ -100,13 +97,14 @@ class ObicoExtension(BaseExtension):
 
             # create obico instances
             for moonraker in mr_instances:
-                instance = MoonrakerObico(suffix=moonraker.suffix)
-                instance.create()
+                current_instance = MoonrakerObico(suffix=moonraker.suffix)
 
-                cmd_sysctl_service(instance.service_file_path.name, "enable")
+                obico_im.current_instance = current_instance
+                obico_im.create_instance()
+                obico_im.enable_instance()
 
                 # create obico config
-                self._create_obico_cfg(instance, moonraker)
+                self._create_obico_cfg(current_instance, moonraker)
 
                 # create obico macros
                 self._create_obico_macros_cfg(moonraker)
@@ -114,17 +112,17 @@ class ObicoExtension(BaseExtension):
                 # create obico update manager
                 self._create_obico_update_manager_cfg(moonraker)
 
-                cmd_sysctl_service(instance.service_file_path.name, "start")
+                obico_im.start_instance()
 
             cmd_sysctl_manage("daemon-reload")
 
             # add to klippers config
             self._patch_printer_cfg(kl_instances)
-            InstanceManager.restart_all(kl_instances)
+            kl_im.restart_all_instance()
 
             # add to moonraker update manager
             self._patch_moonraker_conf(mr_instances)
-            InstanceManager.restart_all(mr_instances)
+            mr_im.restart_all_instance()
 
             # check linking of / ask for linking instances
             self._check_and_opt_link_instances()
@@ -141,13 +139,13 @@ class ObicoExtension(BaseExtension):
     def update_extension(self, **kwargs) -> None:
         Logger.print_status("Updating Obico for Klipper ...")
         try:
-            instances = get_instances(MoonrakerObico)
-            InstanceManager.stop_all(instances)
+            tb_im = InstanceManager(MoonrakerObico)
+            tb_im.stop_all_instance()
 
             git_pull_wrapper(OBICO_REPO, OBICO_DIR)
             self._install_dependencies()
 
-            InstanceManager.start_all(instances)
+            tb_im.start_all_instance()
             Logger.print_ok("Obico for Klipper successfully updated!")
 
         except Exception as e:
@@ -155,17 +153,20 @@ class ObicoExtension(BaseExtension):
 
     def remove_extension(self, **kwargs) -> None:
         Logger.print_status("Removing Obico for Klipper ...")
-
-        kl_instances: List[Klipper] = get_instances(Klipper)
-        mr_instances: List[Moonraker] = get_instances(Moonraker)
-        ob_instances: List[MoonrakerObico] = get_instances(MoonrakerObico)
+        kl_im = InstanceManager(Klipper)
+        kl_instances: List[Klipper] = kl_im.instances
+        mr_im = InstanceManager(Moonraker)
+        mr_instances: List[Moonraker] = mr_im.instances
+        ob_im = InstanceManager(MoonrakerObico)
+        ob_instances: List[MoonrakerObico] = ob_im.instances
 
         try:
-            self._remove_obico_instances(ob_instances)
+            self._remove_obico_instances(ob_im, ob_instances)
             self._remove_obico_dir()
             self._remove_obico_env()
-            remove_config_section(f"include {OBICO_MACROS_CFG_NAME}", kl_instances)
-            remove_config_section(f"include {OBICO_UPDATE_CFG_NAME}", mr_instances)
+            remove_config_section(f"include {OBICO_MACROS_CFG}", kl_instances)
+            remove_config_section(f"include {OBICO_UPDATE_CFG}", mr_instances)
+            self._delete_obico_logs(ob_instances)
             Logger.print_dialog(
                 DialogType.SUCCESS,
                 ["Obico for Klipper successfully removed!"],
@@ -191,10 +192,11 @@ class ObicoExtension(BaseExtension):
                 "http://server_ip:port",
                 "For instance, 'http://192.168.0.5:3334'.",
             ],
+            end="",
         )
 
-    def _print_moonraker_instances(self, mr_instances: List[Moonraker]) -> None:
-        mr_names = [f"● {moonraker.data_dir.name}" for moonraker in mr_instances]
+    def _print_moonraker_instances(self, mr_instances) -> None:
+        mr_names = [f"● {moonraker.data_dir_name}" for moonraker in mr_instances]
         if len(mr_names) > 1:
             Logger.print_dialog(
                 DialogType.INFO,
@@ -204,6 +206,7 @@ class ObicoExtension(BaseExtension):
                     "\n\n",
                     "The setup will apply the same names to Obico!",
                 ],
+                end="",
             )
 
     def _print_is_already_installed(self) -> None:
@@ -211,13 +214,14 @@ class ObicoExtension(BaseExtension):
             DialogType.INFO,
             [
                 "Obico is already installed!",
-                "It is safe to run the installer again to link your "
+                "It is save to run the installer again to link your "
                 "printer or repair any issues.",
                 "\n\n",
                 "You can perform the following actions:",
                 "L) Link printer to the Obico server",
                 "R) Repair installation",
             ],
+            end="",
         )
 
     def _get_server_url(self) -> None:
@@ -233,36 +237,37 @@ class ObicoExtension(BaseExtension):
         # install dependencies
         script = OBICO_DIR.joinpath("install.sh")
         package_list = parse_packages_from_file(script)
-        check_install_dependencies({*package_list})
+        check_install_dependencies(package_list)
 
         # create virtualenv
-        if create_python_venv(OBICO_ENV_DIR):
-            install_python_requirements(OBICO_ENV_DIR, OBICO_REQ_FILE)
+        create_python_venv(OBICO_ENV)
+        requirements = OBICO_DIR.joinpath("requirements.txt")
+        install_python_requirements(OBICO_ENV, requirements)
 
-    def _create_obico_macros_cfg(self, moonraker: Moonraker) -> None:
-        macros_cfg = OBICO_DIR.joinpath(f"include_cfgs/{OBICO_MACROS_CFG_NAME}")
-        macros_target = moonraker.base.cfg_dir.joinpath(OBICO_MACROS_CFG_NAME)
+    def _create_obico_macros_cfg(self, moonraker) -> None:
+        macros_cfg = OBICO_DIR.joinpath(f"include_cfgs/{OBICO_MACROS_CFG}")
+        macros_target = moonraker.cfg_dir.joinpath(OBICO_MACROS_CFG)
         if not macros_target.exists():
             shutil.copy(macros_cfg, macros_target)
         else:
             Logger.print_info(
-                f"Obico's '{OBICO_MACROS_CFG_NAME}' in {moonraker.base.cfg_dir} already exists! Skipped ..."
+                f"Obico's '{OBICO_MACROS_CFG}' in {moonraker.cfg_dir} already exists! Skipped ..."
             )
 
-    def _create_obico_update_manager_cfg(self, moonraker: Moonraker) -> None:
-        update_cfg = OBICO_DIR.joinpath(OBICO_UPDATE_CFG_SAMPLE_NAME)
-        update_cfg_target = moonraker.base.cfg_dir.joinpath(OBICO_UPDATE_CFG_NAME)
+    def _create_obico_update_manager_cfg(self, moonraker) -> None:
+        update_cfg = OBICO_DIR.joinpath(OBICO_UPDATE_CFG_SAMPLE)
+        update_cfg_target = moonraker.cfg_dir.joinpath(OBICO_UPDATE_CFG)
         if not update_cfg_target.exists():
             shutil.copy(update_cfg, update_cfg_target)
         else:
             Logger.print_info(
-                f"Obico's '{OBICO_UPDATE_CFG_NAME}' in {moonraker.base.cfg_dir} already exists! Skipped ..."
+                f"Obico's '{OBICO_UPDATE_CFG}' in {moonraker.cfg_dir} already exists! Skipped ..."
             )
 
     def _create_obico_cfg(
         self, current_instance: MoonrakerObico, moonraker: Moonraker
     ) -> None:
-        cfg_template = OBICO_DIR.joinpath(OBICO_CFG_SAMPLE_NAME)
+        cfg_template = OBICO_DIR.joinpath(OBICO_CFG_SAMPLE)
         cfg_target_file = current_instance.cfg_file
 
         if not cfg_template.exists():
@@ -276,7 +281,7 @@ class ObicoExtension(BaseExtension):
             self._patch_obico_cfg(moonraker, current_instance)
         else:
             Logger.print_info(
-                f"Obico config in {current_instance.base.cfg_dir} already exists! Skipped ..."
+                f"Obico config in {current_instance.cfg_dir} already exists! Skipped ..."
             )
 
     def _patch_obico_cfg(self, moonraker: Moonraker, obico: MoonrakerObico) -> None:
@@ -284,31 +289,23 @@ class ObicoExtension(BaseExtension):
         scp.read(obico.cfg_file)
         scp.set("server", "url", self.server_url)
         scp.set("moonraker", "port", str(moonraker.port))
-        scp.set(
-            "logging",
-            "path",
-            obico.base.log_dir.joinpath(obico.log_file_name).as_posix(),
-        )
+        scp.set("logging", "path", str(obico.log))
         scp.write(obico.cfg_file)
 
     def _patch_printer_cfg(self, klipper: List[Klipper]) -> None:
-        add_config_section(
-            section=f"include {OBICO_MACROS_CFG_NAME}", instances=klipper
-        )
+        add_config_section(section=f"include {OBICO_MACROS_CFG}", instances=klipper)
 
     def _patch_moonraker_conf(self, instances: List[Moonraker]) -> None:
-        add_config_section(
-            section=f"include {OBICO_UPDATE_CFG_NAME}", instances=instances
-        )
+        add_config_section(section=f"include {OBICO_UPDATE_CFG}", instances=instances)
 
-    def _link_obico_instances(self, unlinked_instances) -> None:
+    def _link_obico_instances(self, unlinked_instances):
         for obico in unlinked_instances:
             obico.link()
 
-    def _check_and_opt_link_instances(self) -> None:
+    def _check_and_opt_link_instances(self):
         Logger.print_status("Checking link status of Obico instances ...")
-
-        ob_instances: List[MoonrakerObico] = get_instances(MoonrakerObico)
+        ob_im = InstanceManager(MoonrakerObico)
+        ob_instances: List[MoonrakerObico] = ob_im.instances
         unlinked_instances: List[MoonrakerObico] = [
             obico for obico in ob_instances if not obico.is_linked
         ]
@@ -318,7 +315,7 @@ class ObicoExtension(BaseExtension):
                 [
                     "The Obico instances for the following printers are not "
                     "linked to the server:",
-                    *[f"● {obico.data_dir.name}" for obico in unlinked_instances],
+                    *[f"● {obico.data_dir_name}" for obico in unlinked_instances],
                     "\n\n",
                     "It will take only 10 seconds to link the printer to the Obico server.",
                     "For more information visit:",
@@ -327,6 +324,7 @@ class ObicoExtension(BaseExtension):
                     "If you don't want to link the printer now, you can restart the "
                     "linking process later by running this installer again.",
                 ],
+                end="",
             )
             if not get_confirm("Do you want to link the printers now?"):
                 Logger.print_info("Linking to Obico server skipped ...")
@@ -336,6 +334,7 @@ class ObicoExtension(BaseExtension):
 
     def _remove_obico_instances(
         self,
+        instance_manager: InstanceManager,
         instance_list: List[MoonrakerObico],
     ) -> None:
         if not instance_list:
@@ -344,24 +343,44 @@ class ObicoExtension(BaseExtension):
 
         for instance in instance_list:
             Logger.print_status(
-                f"Removing instance {instance.service_file_path.stem} ..."
+                f"Removing instance {instance.get_service_file_name()} ..."
             )
-            InstanceManager.remove(instance)
+            instance_manager.current_instance = instance
+            instance_manager.stop_instance()
+            instance_manager.disable_instance()
+            instance_manager.delete_instance()
+
+        cmd_sysctl_manage("daemon-reload")
 
     def _remove_obico_dir(self) -> None:
-        Logger.print_status("Removing Obico for Klipper directory ...")
-
         if not OBICO_DIR.exists():
             Logger.print_info(f"'{OBICO_DIR}' does not exist. Skipped ...")
             return
 
-        run_remove_routines(OBICO_DIR)
+        try:
+            shutil.rmtree(OBICO_DIR)
+        except OSError as e:
+            Logger.print_error(f"Unable to delete '{OBICO_DIR}':\n{e}")
 
     def _remove_obico_env(self) -> None:
-        Logger.print_status("Removing Obico for Klipper environment ...")
-
-        if not OBICO_ENV_DIR.exists():
-            Logger.print_info(f"'{OBICO_ENV_DIR}' does not exist. Skipped ...")
+        if not OBICO_ENV.exists():
+            Logger.print_info(f"'{OBICO_ENV}' does not exist. Skipped ...")
             return
 
-        run_remove_routines(OBICO_ENV_DIR)
+        try:
+            shutil.rmtree(OBICO_ENV)
+        except OSError as e:
+            Logger.print_error(f"Unable to delete '{OBICO_ENV}':\n{e}")
+
+    def _delete_obico_logs(self, instances: List[MoonrakerObico]) -> None:
+        Logger.print_status("Removing Obico logs ...")
+        all_logfiles = []
+        for instance in instances:
+            all_logfiles = list(instance.log_dir.glob(f"{OBICO_LOG}*"))
+        if not all_logfiles:
+            Logger.print_info("No Obico logs found. Skipped ...")
+            return
+
+        for log in all_logfiles:
+            Logger.print_status(f"Remove '{log}'")
+            remove_file(log)

kiauh/extensions/pretty_gcode/pretty_gcode_extension.py

@@ -9,16 +9,16 @@
 import shutil
 from pathlib import Path
 
-from components.webui_client.client_utils import create_nginx_cfg
-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,
     remove_file,
 )
 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
@@ -48,14 +48,17 @@ class PrettyGcodeExtension(BaseExtension):
             allow_go_back=True,
         )
 
-        check_install_dependencies({"nginx"})
+        check_install_dependencies(["nginx"])
 
         try:
+            # remove any existing pgc dir
             if PGC_DIR.exists():
                 shutil.rmtree(PGC_DIR)
 
+            # clone pgc repo
             git_clone_wrapper(PGC_REPO, PGC_DIR)
 
+            # copy pgc conf
             create_nginx_cfg(
                 "PrettyGCode for Klipper",
                 cfg_name=PGC_CONF,

kiauh/extensions/telegram_bot/__init__.py

@@ -1,29 +0,0 @@
-# ======================================================================= #
-#  Copyright (C) 2020 - 2024 Dominik Willner <th33xitus@gmail.com>        #
-#                                                                         #
-#  This file is part of KIAUH - Klipper Installation And Update Helper    #
-#  https://github.com/dw-0/kiauh                                          #
-#                                                                         #
-#  This file may be distributed under the terms of the GNU GPLv3 license  #
-# ======================================================================= #
-from pathlib import Path
-
-MODULE_PATH = Path(__file__).resolve().parent
-
-# repo
-TG_BOT_REPO = "https://github.com/nlef/moonraker-telegram-bot.git"
-
-# names
-TG_BOT_CFG_NAME = "telegram.conf"
-TG_BOT_LOG_NAME = "telegram.log"
-TG_BOT_SERVICE_NAME = "moonraker-telegram-bot.service"
-TG_BOT_ENV_FILE_NAME = "moonraker-telegram-bot.env"
-
-# directories
-TG_BOT_DIR = Path.home().joinpath("moonraker-telegram-bot")
-TG_BOT_ENV = Path.home().joinpath("moonraker-telegram-bot-env")
-
-# files
-TG_BOT_SERVICE_TEMPLATE = MODULE_PATH.joinpath(f"assets/{TG_BOT_SERVICE_NAME}")
-TG_BOT_ENV_FILE_TEMPLATE = MODULE_PATH.joinpath(f"assets/{TG_BOT_ENV_FILE_NAME}")
-TG_BOT_REQ_FILE = TG_BOT_DIR.joinpath("scripts/requirements.txt")

kiauh/extensions/telegram_bot/moonraker_telegram_bot.py

@@ -6,122 +6,148 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
-from dataclasses import dataclass, field
 from pathlib import Path
-from subprocess import CalledProcessError
+from subprocess import DEVNULL, CalledProcessError, run
+from typing import List
 
-from components.moonraker.moonraker import Moonraker
-from core.constants import CURRENT_USER
 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,
-    TG_BOT_ENV,
-    TG_BOT_ENV_FILE_NAME,
-    TG_BOT_ENV_FILE_TEMPLATE,
-    TG_BOT_LOG_NAME,
-    TG_BOT_SERVICE_TEMPLATE,
-)
-from utils.fs_utils import create_folders
-from utils.sys_utils import get_service_file_path
+from utils.constants import SYSTEMD
+from utils.logger import Logger
+
+MODULE_PATH = Path(__file__).resolve().parent
+
+TELEGRAM_BOT_DIR = Path.home().joinpath("moonraker-telegram-bot")
+TELEGRAM_BOT_ENV = Path.home().joinpath("moonraker-telegram-bot-env")
+TELEGRAM_BOT_REPO = "https://github.com/nlef/moonraker-telegram-bot.git"
 
 
 # noinspection PyMethodMayBeStatic
-@dataclass(repr=True)
-class MoonrakerTelegramBot:
-    suffix: str
-    base: BaseInstance = field(init=False, repr=False)
-    service_file_path: Path = field(init=False)
-    log_file_name: str = TG_BOT_LOG_NAME
-    bot_dir: Path = TG_BOT_DIR
-    env_dir: Path = TG_BOT_ENV
-    data_dir: Path = field(init=False)
-    cfg_file: Path = field(init=False)
+class MoonrakerTelegramBot(BaseInstance):
+    @classmethod
+    def blacklist(cls) -> List[str]:
+        return ["None", "mcu"]
 
-    def __post_init__(self):
-        self.base: BaseInstance = BaseInstance(Moonraker, self.suffix)
-        self.base.log_file_name = self.log_file_name
+    def __init__(self, suffix: str = ""):
+        super().__init__(instance_type=self, suffix=suffix)
+        self.bot_dir: Path = TELEGRAM_BOT_DIR
+        self.env_dir: Path = TELEGRAM_BOT_ENV
+        self._cfg_file = self.cfg_dir.joinpath("telegram.conf")
+        self._log = self.log_dir.joinpath("telegram.log")
+        self._assets_dir = MODULE_PATH.joinpath("assets")
 
-        self.service_file_path: Path = get_service_file_path(
-            MoonrakerTelegramBot, self.suffix
-        )
-        self.data_dir: Path = self.base.data_dir
-        self.cfg_file = self.base.cfg_dir.joinpath(TG_BOT_CFG_NAME)
+    @property
+    def cfg_file(self) -> Path:
+        return self._cfg_file
+
+    @property
+    def log(self) -> Path:
+        return self._log
 
     def create(self) -> None:
-        from utils.sys_utils import create_env_file, create_service_file
-
         Logger.print_status("Creating new Moonraker Telegram Bot Instance ...")
+        service_template_path = MODULE_PATH.joinpath(
+            "assets/moonraker-telegram-bot.service"
+        )
+        service_file_name = self.get_service_file_name(extension=True)
+        service_file_target = SYSTEMD.joinpath(service_file_name)
+        env_template_file_path = MODULE_PATH.joinpath(
+            "assets/moonraker-telegram-bot.env"
+        )
+        env_file_target = self.sysd_dir.joinpath("moonraker-telegram-bot.env")
 
         try:
-            create_folders(self.base.base_folders)
-            create_service_file(
-                name=self.service_file_path.name,
-                content=self._prep_service_file_content(),
-            )
-            create_env_file(
-                path=self.base.sysd_dir.joinpath(TG_BOT_ENV_FILE_NAME),
-                content=self._prep_env_file_content(),
+            self.create_folders()
+            self.write_service_file(
+                service_template_path, service_file_target, env_file_target
             )
+            self.write_env_file(env_template_file_path, env_file_target)
 
         except CalledProcessError as e:
-            Logger.print_error(f"Error creating instance: {e}")
+            Logger.print_error(
+                f"Error creating service file {service_file_target}: {e}"
+            )
             raise
         except OSError as e:
-            Logger.print_error(f"Error creating env file: {e}")
+            Logger.print_error(f"Error creating env file {env_file_target}: {e}")
             raise
 
-    def _prep_service_file_content(self) -> str:
-        template = TG_BOT_SERVICE_TEMPLATE
+    def delete(self) -> None:
+        service_file = self.get_service_file_name(extension=True)
+        service_file_path = self.get_service_file_path()
+
+        Logger.print_status(f"Deleting Moonraker Telegram Bot Instance: {service_file}")
 
         try:
-            with open(template, "r") as template_file:
+            command = ["sudo", "rm", "-f", service_file_path]
+            run(command, check=True)
+            Logger.print_ok(f"Service file deleted: {service_file_path}")
+        except CalledProcessError as e:
+            Logger.print_error(f"Error deleting service file: {e}")
+            raise
+
+    def write_service_file(
+        self,
+        service_template_path: Path,
+        service_file_target: Path,
+        env_file_target: Path,
+    ) -> None:
+        service_content = self._prep_service_file(
+            service_template_path, env_file_target
+        )
+        command = ["sudo", "tee", service_file_target]
+        run(
+            command,
+            input=service_content.encode(),
+            stdout=DEVNULL,
+            check=True,
+        )
+        Logger.print_ok(f"Service file created: {service_file_target}")
+
+    def write_env_file(
+        self, env_template_file_path: Path, env_file_target: Path
+    ) -> None:
+        env_file_content = self._prep_env_file(env_template_file_path)
+        with open(env_file_target, "w") as env_file:
+            env_file.write(env_file_content)
+        Logger.print_ok(f"Env file created: {env_file_target}")
+
+    def _prep_service_file(
+        self, service_template_path: Path, env_file_path: Path
+    ) -> str:
+        try:
+            with open(service_template_path, "r") as template_file:
                 template_content = template_file.read()
         except FileNotFoundError:
-            Logger.print_error(f"Unable to open {template} - File not found")
+            Logger.print_error(
+                f"Unable to open {service_template_path} - File not found"
+            )
             raise
-
-        service_content = template_content.replace(
-            "%USER%",
-            CURRENT_USER,
-        )
+        service_content = template_content.replace("%USER%", self.user)
         service_content = service_content.replace(
             "%TELEGRAM_BOT_DIR%",
-            self.bot_dir.as_posix(),
-        )
-        service_content = service_content.replace(
-            "%ENV%",
-            self.env_dir.as_posix(),
-        )
-        service_content = service_content.replace(
-            "%ENV_FILE%",
-            self.base.sysd_dir.joinpath(TG_BOT_ENV_FILE_NAME).as_posix(),
+            str(self.bot_dir),
         )
+        service_content = service_content.replace("%ENV%", str(self.env_dir))
+        service_content = service_content.replace("%ENV_FILE%", str(env_file_path))
         return service_content
 
-    def _prep_env_file_content(self) -> str:
-        template = TG_BOT_ENV_FILE_TEMPLATE
-
+    def _prep_env_file(self, env_template_file_path: Path) -> str:
         try:
-            with open(template, "r") as env_file:
+            with open(env_template_file_path, "r") as env_file:
                 env_template_file_content = env_file.read()
         except FileNotFoundError:
-            Logger.print_error(f"Unable to open {template} - File not found")
+            Logger.print_error(
+                f"Unable to open {env_template_file_path} - File not found"
+            )
             raise
-
         env_file_content = env_template_file_content.replace(
             "%TELEGRAM_BOT_DIR%",
-            self.bot_dir.as_posix(),
+            str(self.bot_dir),
         )
         env_file_content = env_file_content.replace(
             "%CFG%",
-            f"{self.base.cfg_dir}/printer.cfg",
-        )
-        env_file_content = env_file_content.replace(
-            "%LOG%",
-            self.base.log_dir.joinpath(self.log_file_name).as_posix(),
+            f"{self.cfg_dir}/printer.cfg",
         )
+        env_file_content = env_file_content.replace("%LOG%", str(self.log))
         return env_file_content

kiauh/extensions/telegram_bot/moonraker_telegram_bot_extension.py

@@ -12,12 +12,11 @@ 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, TG_BOT_REQ_FILE
 from extensions.telegram_bot.moonraker_telegram_bot import (
-    TG_BOT_DIR,
-    TG_BOT_ENV,
+    TELEGRAM_BOT_DIR,
+    TELEGRAM_BOT_ENV,
+    TELEGRAM_BOT_REPO,
     MoonrakerTelegramBot,
 )
 from utils.common import check_install_dependencies
@@ -25,10 +24,9 @@ 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.instance_utils import get_instances
+from utils.logger import DialogType, Logger
 from utils.sys_utils import (
     cmd_sysctl_manage,
-    cmd_sysctl_service,
     create_python_venv,
     install_python_requirements,
     parse_packages_from_file,
@@ -39,8 +37,8 @@ from utils.sys_utils import (
 class TelegramBotExtension(BaseExtension):
     def install_extension(self, **kwargs) -> None:
         Logger.print_status("Installing Moonraker Telegram Bot ...")
-
-        mr_instances: List[Moonraker] = get_instances(Moonraker)
+        mr_im = InstanceManager(Moonraker)
+        mr_instances: List[Moonraker] = mr_im.instances
         if not mr_instances:
             Logger.print_dialog(
                 DialogType.WARNING,
@@ -52,9 +50,7 @@ class TelegramBotExtension(BaseExtension):
             )
             return
 
-        instance_names = [
-            f"● {instance.service_file_path.name}" for instance in mr_instances
-        ]
+        instance_names = [f"● {instance.data_dir_name}" for instance in mr_instances]
         Logger.print_dialog(
             DialogType.INFO,
             [
@@ -74,33 +70,37 @@ class TelegramBotExtension(BaseExtension):
         create_example_cfg = get_confirm("Create example telegram.conf?")
 
         try:
-            git_clone_wrapper(TG_BOT_REPO, TG_BOT_DIR)
+            git_clone_wrapper(TELEGRAM_BOT_REPO, TELEGRAM_BOT_DIR)
             self._install_dependencies()
 
             # create and start services / create bot configs
             show_config_dialog = False
+            tb_im = InstanceManager(MoonrakerTelegramBot)
             tb_names = [mr_i.suffix for mr_i in mr_instances]
             for name in tb_names:
-                instance = MoonrakerTelegramBot(suffix=name)
-                instance.create()
+                current_instance = MoonrakerTelegramBot(suffix=name)
 
-                cmd_sysctl_service(instance.service_file_path.name, "enable")
+                tb_im.current_instance = current_instance
+                tb_im.create_instance()
+                tb_im.enable_instance()
 
                 if create_example_cfg:
                     Logger.print_status(
-                        f"Creating Telegram Bot config in {instance.base.cfg_dir} ..."
+                        f"Creating Telegram Bot config in {current_instance.cfg_dir} ..."
                     )
-                    template = TG_BOT_DIR.joinpath("scripts/base_install_template")
-                    target_file = instance.cfg_file
+                    template = TELEGRAM_BOT_DIR.joinpath(
+                        "scripts/base_install_template"
+                    )
+                    target_file = current_instance.cfg_file
                     if not target_file.exists():
                         show_config_dialog = True
                         run(["cp", template, target_file], check=True)
                     else:
                         Logger.print_info(
-                            f"Telegram Bot config in {instance.base.cfg_dir} already exists! Skipped ..."
+                            f"Telegram Bot config in {current_instance.cfg_dir} already exists! Skipped ..."
                         )
 
-                cmd_sysctl_service(instance.service_file_path.name, "start")
+                tb_im.start_instance()
 
             cmd_sysctl_manage("daemon-reload")
 
@@ -108,7 +108,7 @@ class TelegramBotExtension(BaseExtension):
             self._patch_bot_update_manager(mr_instances)
 
             # restart moonraker
-            InstanceManager.restart_all(mr_instances)
+            mr_im.restart_all_instance()
 
             if show_config_dialog:
                 Logger.print_dialog(
@@ -120,7 +120,6 @@ class TelegramBotExtension(BaseExtension):
                         "following wiki page for further information:",
                         "https://github.com/nlef/moonraker-telegram-bot/wiki",
                     ],
-                    margin_bottom=1,
                 )
 
             Logger.print_ok("Telegram Bot installation complete!")
@@ -131,23 +130,23 @@ class TelegramBotExtension(BaseExtension):
 
     def update_extension(self, **kwargs) -> None:
         Logger.print_status("Updating Moonraker Telegram Bot ...")
+        tb_im = InstanceManager(MoonrakerTelegramBot)
+        tb_im.stop_all_instance()
 
-        instances = get_instances(MoonrakerTelegramBot)
-        InstanceManager.stop_all(instances)
-
-        git_pull_wrapper(TG_BOT_REPO, TG_BOT_DIR)
+        git_pull_wrapper(TELEGRAM_BOT_REPO, TELEGRAM_BOT_DIR)
         self._install_dependencies()
 
-        InstanceManager.start_all(instances)
+        tb_im.start_all_instance()
 
     def remove_extension(self, **kwargs) -> None:
         Logger.print_status("Removing Moonraker Telegram Bot ...")
-
-        mr_instances: List[Moonraker] = get_instances(Moonraker)
-        tb_instances: List[MoonrakerTelegramBot] = get_instances(MoonrakerTelegramBot)
+        mr_im = InstanceManager(Moonraker)
+        mr_instances: List[Moonraker] = mr_im.instances
+        tb_im = InstanceManager(MoonrakerTelegramBot)
+        tb_instances: List[MoonrakerTelegramBot] = tb_im.instances
 
         try:
-            self._remove_bot_instances(tb_instances)
+            self._remove_bot_instances(tb_im, tb_instances)
             self._remove_bot_dir()
             self._remove_bot_env()
             remove_config_section("update_manager moonraker-telegram-bot", mr_instances)
@@ -159,23 +158,24 @@ class TelegramBotExtension(BaseExtension):
 
     def _install_dependencies(self) -> None:
         # install dependencies
-        script = TG_BOT_DIR.joinpath("scripts/install.sh")
+        script = TELEGRAM_BOT_DIR.joinpath("scripts/install.sh")
         package_list = parse_packages_from_file(script)
-        check_install_dependencies({*package_list})
+        check_install_dependencies(package_list)
 
         # create virtualenv
-        if create_python_venv(TG_BOT_ENV):
-            install_python_requirements(TG_BOT_ENV, TG_BOT_REQ_FILE)
+        create_python_venv(TELEGRAM_BOT_ENV)
+        requirements = TELEGRAM_BOT_DIR.joinpath("scripts/requirements.txt")
+        install_python_requirements(TELEGRAM_BOT_ENV, requirements)
 
     def _patch_bot_update_manager(self, instances: List[Moonraker]) -> None:
-        env_py = f"{TG_BOT_ENV}/bin/python"
+        env_py = f"{TELEGRAM_BOT_ENV}/bin/python"
         add_config_section(
             section="update_manager moonraker-telegram-bot",
             instances=instances,
             options=[
                 ("type", "git_repo"),
-                ("path", str(TG_BOT_DIR)),
-                ("origin", TG_BOT_REPO),
+                ("path", str(TELEGRAM_BOT_DIR)),
+                ("orgin", TELEGRAM_BOT_REPO),
                 ("env", env_py),
                 ("requirements", "scripts/requirements.txt"),
                 ("install_script", "scripts/install.sh"),
@@ -184,38 +184,44 @@ class TelegramBotExtension(BaseExtension):
 
     def _remove_bot_instances(
         self,
+        instance_manager: InstanceManager,
         instance_list: List[MoonrakerTelegramBot],
     ) -> None:
         for instance in instance_list:
             Logger.print_status(
-                f"Removing instance {instance.service_file_path.stem} ..."
+                f"Removing instance {instance.get_service_file_name()} ..."
             )
-            InstanceManager.remove(instance)
+            instance_manager.current_instance = instance
+            instance_manager.stop_instance()
+            instance_manager.disable_instance()
+            instance_manager.delete_instance()
+
+        cmd_sysctl_manage("daemon-reload")
 
     def _remove_bot_dir(self) -> None:
-        if not TG_BOT_DIR.exists():
-            Logger.print_info(f"'{TG_BOT_DIR}' does not exist. Skipped ...")
+        if not TELEGRAM_BOT_DIR.exists():
+            Logger.print_info(f"'{TELEGRAM_BOT_DIR}' does not exist. Skipped ...")
             return
 
         try:
-            shutil.rmtree(TG_BOT_DIR)
+            shutil.rmtree(TELEGRAM_BOT_DIR)
         except OSError as e:
-            Logger.print_error(f"Unable to delete '{TG_BOT_DIR}':\n{e}")
+            Logger.print_error(f"Unable to delete '{TELEGRAM_BOT_DIR}':\n{e}")
 
     def _remove_bot_env(self) -> None:
-        if not TG_BOT_ENV.exists():
-            Logger.print_info(f"'{TG_BOT_ENV}' does not exist. Skipped ...")
+        if not TELEGRAM_BOT_ENV.exists():
+            Logger.print_info(f"'{TELEGRAM_BOT_ENV}' does not exist. Skipped ...")
             return
 
         try:
-            shutil.rmtree(TG_BOT_ENV)
+            shutil.rmtree(TELEGRAM_BOT_ENV)
         except OSError as e:
-            Logger.print_error(f"Unable to delete '{TG_BOT_ENV}':\n{e}")
+            Logger.print_error(f"Unable to delete '{TELEGRAM_BOT_ENV}':\n{e}")
 
     def _delete_bot_logs(self, instances: List[MoonrakerTelegramBot]) -> None:
         all_logfiles = []
         for instance in instances:
-            all_logfiles = list(instance.base.log_dir.glob("telegram_bot.log*"))
+            all_logfiles = list(instance.log_dir.glob("telegram_bot.log*"))
         if not all_logfiles:
             Logger.print_info("No Moonraker Telegram Bot logs found. Skipped ...")
             return

kiauh/main.py

@@ -7,12 +7,12 @@
 #  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:
+def main():
     try:
         KiauhSettings()
         MainMenu().run()

kiauh/procedures/switch_repo.py

@@ -1,154 +0,0 @@
-# ======================================================================= #
-#  Copyright (C) 2020 - 2024 Dominik Willner <th33xitus@gmail.com>        #
-#                                                                         #
-#  This file is part of KIAUH - Klipper Installation And Update Helper    #
-#  https://github.com/dw-0/kiauh                                          #
-#                                                                         #
-#  This file may be distributed under the terms of the GNU GPLv3 license  #
-# ======================================================================= #
-from __future__ import annotations
-
-import shutil
-from pathlib import Path
-from typing import Literal
-
-from components.klipper import (
-    KLIPPER_BACKUP_DIR,
-    KLIPPER_DIR,
-    KLIPPER_ENV_DIR,
-    KLIPPER_REQ_FILE,
-)
-from components.klipper.klipper import Klipper
-from components.klipper.klipper_setup import install_klipper_packages
-from components.moonraker import (
-    MOONRAKER_BACKUP_DIR,
-    MOONRAKER_DIR,
-    MOONRAKER_ENV_DIR,
-    MOONRAKER_REQ_FILE,
-)
-from components.moonraker.moonraker import Moonraker
-from components.moonraker.moonraker_setup import install_moonraker_packages
-from core.backup_manager.backup_manager import BackupManager, BackupManagerException
-from core.instance_manager.instance_manager import InstanceManager
-from core.logger import Logger
-from core.settings.kiauh_settings import RepoSettings
-from utils.git_utils import GitException, get_repo_name, git_clone_wrapper
-from utils.instance_utils import get_instances
-from utils.sys_utils import (
-    VenvCreationFailedException,
-    create_python_venv,
-    install_python_requirements,
-)
-
-
-class RepoSwitchFailedException(Exception):
-    pass
-
-
-def run_switch_repo_routine(
-    name: Literal["klipper", "moonraker"], repo_settings: RepoSettings
-) -> None:
-    repo_dir: Path = KLIPPER_DIR if name == "klipper" else MOONRAKER_DIR
-    env_dir: Path = KLIPPER_ENV_DIR if name == "klipper" else MOONRAKER_ENV_DIR
-    req_file = KLIPPER_REQ_FILE if name == "klipper" else MOONRAKER_REQ_FILE
-    backup_dir: Path = KLIPPER_BACKUP_DIR if name == "klipper" else MOONRAKER_BACKUP_DIR
-    _type = Klipper if name == "klipper" else Moonraker
-
-    # step 1: stop all instances
-    Logger.print_status(f"Stopping all {_type.__name__} instances ...")
-    instances = get_instances(_type)
-    InstanceManager.stop_all(instances)
-
-    repo_dir_backup_path: Path | None = None
-    env_dir_backup_path: Path | None = None
-
-    try:
-        # step 2: backup old repo and env
-        org, repo = get_repo_name(repo_dir)
-        backup_dir = backup_dir.joinpath(org)
-        bm = BackupManager()
-        repo_dir_backup_path = bm.backup_directory(
-            repo_dir.name,
-            repo_dir,
-            backup_dir,
-        )
-        env_dir_backup_path = bm.backup_directory(
-            env_dir.name,
-            env_dir,
-            backup_dir,
-        )
-
-        # step 3: read repo url and branch from settings
-        repo_url = repo_settings.repo_url
-        branch = repo_settings.branch
-
-        if not (repo_url or branch):
-            error = f"Invalid repository URL ({repo_url}) or branch ({branch})!"
-            raise ValueError(error)
-
-        # step 4: clone new repo
-        git_clone_wrapper(repo_url, repo_dir, branch, force=True)
-
-        # step 5: install os dependencies
-        if name == "klipper":
-            install_klipper_packages()
-        elif name == "moonraker":
-            install_moonraker_packages()
-
-        # step 6: recreate python virtualenv
-        Logger.print_status(f"Recreating {_type.__name__} virtualenv ...")
-        if not create_python_venv(env_dir, force=True):
-            raise GitException(f"Failed to recreate virtualenv for {_type.__name__}")
-        else:
-            install_python_requirements(env_dir, req_file)
-
-        Logger.print_ok(f"Switched to {repo_url} at branch {branch}!")
-
-    except BackupManagerException as e:
-        Logger.print_error(f"Error during backup of repository: {e}")
-        raise RepoSwitchFailedException(e)
-
-    except (GitException, VenvCreationFailedException) as e:
-        # if something goes wrong during cloning or recreating the virtualenv,
-        # we restore the backup of the repo and env
-        Logger.print_error(f"Error during repository switch: {e}", start="\n")
-        Logger.print_status(f"Restoring last backup of {_type.__name__} ...")
-        _restore_repo_backup(
-            _type.__name__,
-            env_dir,
-            env_dir_backup_path,
-            repo_dir,
-            repo_dir_backup_path,
-        )
-
-    except RepoSwitchFailedException as e:
-        Logger.print_error(f"Something went wrong: {e}")
-        return
-
-    Logger.print_status(f"Restarting all {_type.__name__} instances ...")
-    InstanceManager.start_all(instances)
-
-
-def _restore_repo_backup(
-    name: str,
-    env_dir: Path,
-    env_dir_backup_path: Path | None,
-    repo_dir: Path,
-    repo_dir_backup_path: Path | None,
-) -> None:
-    # if repo_dir_backup_path is not None and env_dir_backup_path is not None:
-    if not repo_dir_backup_path or not env_dir_backup_path:
-        raise RepoSwitchFailedException(
-            f"Unable to restore backup of {name}! Path of backups directory is None!"
-        )
-
-    try:
-        if repo_dir.exists():
-            shutil.rmtree(repo_dir)
-            shutil.copytree(repo_dir_backup_path, repo_dir)
-        if env_dir.exists():
-            shutil.rmtree(env_dir)
-            shutil.copytree(env_dir_backup_path, env_dir)
-        Logger.print_warn(f"Restored backup of {name} successfully!")
-    except Exception as e:
-        raise RepoSwitchFailedException(f"Error restoring backup: {e}")

kiauh/procedures/system.py

@@ -1,103 +0,0 @@
-# ======================================================================= #
-#  Copyright (C) 2020 - 2024 Dominik Willner <th33xitus@gmail.com>        #
-#                                                                         #
-#  This file is part of KIAUH - Klipper Installation And Update Helper    #
-#  https://github.com/dw-0/kiauh                                          #
-#                                                                         #
-#  This file may be distributed under the terms of the GNU GPLv3 license  #
-# ======================================================================= #
-
-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
-
-
-def change_system_hostname() -> None:
-    """
-    Procedure to change the system hostname.
-    :return:
-    """
-
-    Logger.print_dialog(
-        DialogType.CUSTOM,
-        [
-            "Changing the hostname of this system allows you to access an installed "
-            "webinterface by simply typing the hostname like this in the browser:",
-            "\n\n",
-            "http://<hostname>.local",
-            "\n\n",
-            "Example: If you set your hostname to 'my-printer', you can access an "
-            "installed webinterface by tyoing 'http://my-printer.local' in the "
-            "browser.",
-        ],
-        custom_title="CHANGE SYSTEM HOSTNAME",
-    )
-    if not get_confirm("Do you want to change the hostname?", default_choice=False):
-        return
-
-    Logger.print_dialog(
-        DialogType.CUSTOM,
-        [
-            "Allowed characters: a-z, 0-9 and '-'",
-            "The name must not contain the following:",
-            "\n\n",
-            "● Any special characters",
-            "● No leading or trailing '-'",
-        ],
-    )
-    hostname = get_string_input(
-        "Enter the new hostname",
-        regex="^[a-z0-9]+([a-z0-9-]*[a-z0-9])?$",
-    )
-    if not get_confirm(f"Change the hostname to '{hostname}'?", default_choice=False):
-        Logger.print_info("Aborting hostname change ...")
-        return
-
-    try:
-        Logger.print_status("Changing hostname ...")
-
-        Logger.print_status("Checking for dependencies ...")
-        check_install_dependencies({"avahi-daemon"}, include_global=False)
-
-        # create or backup hosts file
-        Logger.print_status("Creating backup of hosts file ...")
-        hosts_file = Path("/etc/hosts")
-        if not check_file_exist(hosts_file, True):
-            cmd = ["sudo", "touch", hosts_file.as_posix()]
-            run(cmd, stderr=PIPE, check=True)
-        else:
-            date_time = get_current_date()
-            name = f"hosts.{date_time.get('date')}-{date_time.get('time')}.bak"
-            hosts_file_backup = Path(f"/etc/{name}")
-            cmd = [
-                "sudo",
-                "cp",
-                hosts_file.as_posix(),
-                hosts_file_backup.as_posix(),
-            ]
-            run(cmd, stderr=PIPE, check=True)
-        Logger.print_ok()
-
-        # call hostnamectl set-hostname <hostname>
-        Logger.print_status(f"Setting hostname to '{hostname}' ...")
-        cmd = ["sudo", "hostnamectl", "set-hostname", hostname]
-        run(cmd, stderr=PIPE, check=True)
-        Logger.print_ok()
-
-        # add hostname to hosts file at the end of the file
-        Logger.print_status("Writing new hostname to /etc/hosts ...")
-        stdin = f"127.0.0.1       {hostname}\n"
-        cmd = ["sudo", "tee", "-a", hosts_file.as_posix()]
-        run(cmd, input=stdin.encode(), stderr=PIPE, stdout=PIPE, check=True)
-        Logger.print_ok()
-
-        Logger.print_ok("New hostname successfully configured!")
-        Logger.print_ok("Remember to reboot for the changes to take effect!\n")
-
-    except CalledProcessError as e:
-        Logger.print_error(f"Error during change hostname procedure: {e}")
-        return

kiauh/utils/__init__.py

@@ -9,4 +9,13 @@
 
 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")
+
+# ================== 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

@@ -6,42 +6,27 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
-
 import re
 from datetime import datetime
 from pathlib import Path
-from typing import Dict, List, Literal, Optional, Set
+from typing import Dict, List, Literal, Optional, Type
 
 from components.klipper.klipper import Klipper
-from core.constants import (
+from core.instance_manager.base_instance import BaseInstance
+from core.instance_manager.instance_manager import InstanceManager
+from utils import PRINTER_CFG_BACKUP_DIR
+from utils.constants import (
     COLOR_CYAN,
-    GLOBAL_DEPS,
-    PRINTER_CFG_BACKUP_DIR,
     RESET_FORMAT,
 )
-from core.logger import DialogType, Logger
-from core.types import ComponentStatus, StatusCode
-from utils.git_utils import (
-    get_local_commit,
-    get_local_tags,
-    get_remote_commit,
-    get_repo_name,
-)
-from utils.instance_utils import get_instances
+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,
 )
-
-
-def get_kiauh_version() -> str:
-    """
-    Helper method to get the current KIAUH version by reading the latest tag
-    :return: string of the latest tag
-    """
-    return get_local_tags(Path(__file__).parent.parent)[-1]
+from utils.types import ComponentStatus, InstallStatus
 
 
 def convert_camelcase_to_kebabcase(name: str) -> str:
@@ -60,28 +45,19 @@ def get_current_date() -> Dict[Literal["date", "time"], str]:
     return {"date": date, "time": time}
 
 
-def check_install_dependencies(
-    deps: Set[str] | None = None, include_global: bool = True
-) -> None:
+def check_install_dependencies(deps: List[str]) -> None:
     """
     Common helper method to check if dependencies are installed
     and if not, install them automatically |
-    :param include_global: Wether to include the global dependencies or not
     :param deps: List of strings of package names to check if installed
     :return: None
     """
-    if deps is None:
-        deps = set()
-
-    if include_global:
-        deps.update(GLOBAL_DEPS)
-
     requirements = check_package_install(deps)
     if requirements:
         Logger.print_status("Installing dependencies ...")
         Logger.print_info("The following packages need installation:")
-        for r in requirements:
-            print(f"{COLOR_CYAN}● {r}{RESET_FORMAT}")
+        for _ in requirements:
+            print(f"{COLOR_CYAN}● {_}{RESET_FORMAT}")
         update_system_package_lists(silent=False)
         install_system_packages(requirements)
 
@@ -89,7 +65,7 @@ def check_install_dependencies(
 def get_install_status(
     repo_dir: Path,
     env_dir: Optional[Path] = None,
-    instance_type: type | None = None,
+    instance_type: Optional[Type[BaseInstance]] = None,
     files: Optional[List[Path]] = None,
 ) -> ComponentStatus:
     """
@@ -100,53 +76,52 @@ def get_install_status(
     :param files: List of optional files to check for existence
     :return: Dictionary with status string, statuscode and instance count
     """
-    from utils.instance_utils import get_instances
-
     checks = [repo_dir.exists()]
 
     if env_dir is not None:
         checks.append(env_dir.exists())
 
+    im = InstanceManager(instance_type)
     instances = 0
     if instance_type is not None:
-        instances = len(get_instances(instance_type))
+        instances = len(im.instances)
         checks.append(instances > 0)
 
     if files is not None:
         for f in files:
             checks.append(f.exists())
 
-    status: StatusCode
     if all(checks):
-        status = 2  # installed
-    elif not any(checks):
-        status = 0  # not installed
-    else:
-        status = 1  # incomplete
+        status = InstallStatus.INSTALLED
+
+    elif not any(checks):
+        status = InstallStatus.NOT_INSTALLED
+
+    else:
+        status = InstallStatus.INCOMPLETE
 
-    org, repo = get_repo_name(repo_dir)
     return ComponentStatus(
         status=status,
         instances=instances,
-        owner=org,
-        repo=repo,
+        repo=get_repo_name(repo_dir),
         local=get_local_commit(repo_dir),
         remote=get_remote_commit(repo_dir),
     )
 
 
-def backup_printer_config_dir() -> None:
+def backup_printer_config_dir():
     # local import to prevent circular import
     from core.backup_manager.backup_manager import BackupManager
 
-    instances: List[Klipper] = get_instances(Klipper)
+    im = InstanceManager(Klipper)
+    instances: List[Klipper] = im.instances
     bm = BackupManager()
 
     for instance in instances:
-        name = f"config-{instance.data_dir.name}"
+        name = f"config-{instance.data_dir_name}"
         bm.backup_directory(
             name,
-            source=instance.base.cfg_dir,
+            source=instance.cfg_dir,
             target=PRINTER_CFG_BACKUP_DIR,
         )
 
@@ -159,7 +134,8 @@ def moonraker_exists(name: str = "") -> bool:
     """
     from components.moonraker.moonraker import Moonraker
 
-    mr_instances: List[Moonraker] = get_instances(Moonraker)
+    mr_im = InstanceManager(Moonraker)
+    mr_instances: List[Moonraker] = mr_im.instances
 
     info = (
         f"{name} requires Moonraker to be installed"
@@ -174,6 +150,7 @@ def moonraker_exists(name: str = "") -> bool:
                 "No Moonraker instances found!",
                 f"{info}. Please install Moonraker first!",
             ],
+            end="",
         )
         return False
     return True

kiauh/utils/config_utils.py

@@ -6,25 +6,25 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
-
 import tempfile
 from pathlib import Path
-from typing import List, Tuple
+from typing import List, Optional, Tuple, TypeVar
 
-from core.instance_type import InstanceType
-from core.logger import Logger
+from components.klipper.klipper import Klipper
+from components.moonraker.moonraker import Moonraker
 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]
 
 
 def add_config_section(
     section: str,
-    instances: List[InstanceType],
-    options: List[ConfigOption] | None = None,
+    instances: List[B],
+    options: Optional[List[ConfigOption]] = None,
 ) -> None:
     for instance in instances:
         cfg_file = instance.cfg_file
@@ -49,7 +49,7 @@ def add_config_section(
         scp.write(cfg_file)
 
 
-def add_config_section_at_top(section: str, instances: List[InstanceType]) -> None:
+def add_config_section_at_top(section: str, instances: List[B]):
     # TODO: this could be implemented natively in SimpleConfigParser
     for instance in instances:
         tmp_cfg = tempfile.NamedTemporaryFile(mode="w", delete=False)
@@ -70,7 +70,7 @@ def add_config_section_at_top(section: str, instances: List[InstanceType]) -> No
         tmp_cfg_path.rename(cfg_file)
 
 
-def remove_config_section(section: str, instances: List[InstanceType]) -> None:
+def remove_config_section(section: str, instances: List[B]) -> None:
     for instance in instances:
         cfg_file = instance.cfg_file
         Logger.print_status(f"Remove section '[{section}]' from '{cfg_file}' ...")

kiauh/utils/constants.py

@@ -11,8 +11,6 @@ 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
@@ -21,19 +19,6 @@ 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/utils/decorators.py

@@ -6,14 +6,12 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
-
 import warnings
 from typing import Callable
 
 
-def deprecated(info: str = "", replaced_by: Callable | None = None) -> Callable:
-    def decorator(func) -> Callable:
+def deprecated(info: str = "", replaced_by: Callable = None) -> Callable:
+    def decorator(func):
         def wrapper(*args, **kwargs):
             msg = f"{info}{replaced_by.__name__ if replaced_by else ''}"
             warnings.warn(msg, category=DeprecationWarning, stacklevel=2)

kiauh/utils/fs_utils.py

@@ -8,7 +8,6 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import re
 import shutil
@@ -17,8 +16,15 @@ from subprocess import DEVNULL, PIPE, CalledProcessError, check_output, run
 from typing import List
 from zipfile import ZipFile
 
-from core.decorators import deprecated
-from core.logger import Logger
+from components.klipper.klipper import Klipper
+from utils import (
+    MODULE_PATH,
+    NGINX_CONFD,
+    NGINX_SITES_AVAILABLE,
+    NGINX_SITES_ENABLED,
+)
+from utils.decorators import deprecated
+from utils.logger import Logger
 
 
 def check_file_exist(file_path: Path, sudo=False) -> bool:
@@ -30,7 +36,7 @@ def check_file_exist(file_path: Path, sudo=False) -> bool:
     """
     if sudo:
         try:
-            command = ["sudo", "find", file_path.as_posix()]
+            command = ["sudo", "find", file_path]
             check_output(command, stderr=DEVNULL)
             return True
         except CalledProcessError:
@@ -44,7 +50,7 @@ def check_file_exist(file_path: Path, sudo=False) -> bool:
 
 def create_symlink(source: Path, target: Path, sudo=False) -> None:
     try:
-        cmd = ["ln", "-sf", source.as_posix(), target.as_posix()]
+        cmd = ["ln", "-sf", source, target]
         if sudo:
             cmd.insert(0, "sudo")
         run(cmd, stderr=PIPE, check=True)
@@ -53,12 +59,12 @@ def create_symlink(source: Path, target: Path, sudo=False) -> None:
         raise
 
 
-def remove_with_sudo(file: Path) -> None:
+def remove_with_sudo(file_path: Path) -> None:
     try:
-        cmd = ["sudo", "rm", "-rf", file.as_posix()]
+        cmd = ["sudo", "rm", "-f", file_path]
         run(cmd, stderr=PIPE, check=True)
     except CalledProcessError as e:
-        Logger.print_error(f"Failed to remove {file}: {e}")
+        Logger.print_error(f"Failed to remove file: {e}")
         raise
 
 
@@ -73,30 +79,6 @@ def remove_file(file_path: Path, sudo=False) -> None:
         raise
 
 
-def run_remove_routines(file: Path) -> None:
-    try:
-        if not file.is_symlink() and not file.exists():
-            Logger.print_info(f"File '{file}' does not exist. Skipped ...")
-            return
-
-        if file.is_dir():
-            shutil.rmtree(file)
-        elif file.is_file() or file.is_symlink():
-            file.unlink()
-        else:
-            raise OSError(f"File '{file}' is neither a file nor a directory!")
-        Logger.print_ok(f"File '{file}' was successfully removed!")
-    except OSError as e:
-        Logger.print_error(f"Unable to delete '{file}':\n{e}")
-        try:
-            Logger.print_info("Trying to remove with sudo ...")
-            remove_with_sudo(file)
-            Logger.print_ok(f"File '{file}' was successfully removed!")
-        except CalledProcessError as e:
-            Logger.print_error(f"Error deleting '{file}' with sudo:\n{e}")
-            Logger.print_error("Remove this directory manually!")
-
-
 def unzip(filepath: Path, target_dir: Path) -> None:
     """
     Helper function to unzip a zip-archive into a target directory |
@@ -108,35 +90,150 @@ def unzip(filepath: Path, target_dir: Path) -> None:
         _zip.extractall(target_dir)
 
 
-def create_folders(dirs: List[Path]) -> None:
+def copy_upstream_nginx_cfg() -> None:
+    """
+    Creates an upstream.conf in /etc/nginx/conf.d
+    :return: None
+    """
+    source = MODULE_PATH.joinpath("assets/upstreams.conf")
+    target = NGINX_CONFD.joinpath("upstreams.conf")
     try:
-        for _dir in dirs:
-            if _dir.exists():
-                continue
-            _dir.mkdir(exist_ok=True)
-            Logger.print_ok(f"Created directory '{_dir}'!")
-    except OSError as e:
-        Logger.print_error(f"Error creating directories: {e}")
+        command = ["sudo", "cp", source, target]
+        run(command, stderr=PIPE, check=True)
+    except CalledProcessError as e:
+        log = f"Unable to create upstreams.conf: {e.stderr.decode()}"
+        Logger.print_error(log)
         raise
 
 
-def get_data_dir(instance_type: type, suffix: str) -> Path:
-    from utils.sys_utils import get_service_file_path
+def copy_common_vars_nginx_cfg() -> None:
+    """
+    Creates a common_vars.conf in /etc/nginx/conf.d
+    :return: None
+    """
+    source = MODULE_PATH.joinpath("assets/common_vars.conf")
+    target = NGINX_CONFD.joinpath("common_vars.conf")
+    try:
+        command = ["sudo", "cp", source, target]
+        run(command, stderr=PIPE, check=True)
+    except CalledProcessError as e:
+        log = f"Unable to create upstreams.conf: {e.stderr.decode()}"
+        Logger.print_error(log)
+        raise
 
-    # if the service file exists, we read the data dir path from it
-    # this also ensures compatibility with pre v6.0.0 instances
-    service_file_path: Path = get_service_file_path(instance_type, suffix)
-    if service_file_path and service_file_path.exists():
-        with open(service_file_path, "r") as service_file:
-            lines = service_file.readlines()
-            for line in lines:
-                pattern = r"^EnvironmentFile=(.+)(/systemd/.+\.env)"
-                match = re.search(pattern, line)
-                if match:
-                    return Path(match.group(1))
 
-    if suffix != "":
-        # this is the new data dir naming scheme introduced in v6.0.0
-        return Path.home().joinpath(f"printer_{suffix}_data")
+def generate_nginx_cfg_from_template(name: str, template_src: Path, **kwargs) -> None:
+    """
+    Creates an NGINX config from a template file and
+    replaces all placeholders passed as kwargs. A placeholder must be defined
+    in the template file as %{placeholder}%.
+    :param name: name of the config to create
+    :param template_src: the path to the template file
+    :return: None
+    """
+    tmp = Path.home().joinpath(f"{name}.tmp")
+    shutil.copy(template_src, tmp)
+    with open(tmp, "r+") as f:
+        content = f.read()
 
-    return Path.home().joinpath("printer_data")
+        for key, value in kwargs.items():
+            content = content.replace(f"%{key}%", str(value))
+
+        f.seek(0)
+        f.write(content)
+        f.truncate()
+
+    target = NGINX_SITES_AVAILABLE.joinpath(name)
+    try:
+        command = ["sudo", "mv", tmp, target]
+        run(command, stderr=PIPE, check=True)
+    except CalledProcessError as e:
+        log = f"Unable to create '{target}': {e.stderr.decode()}"
+        Logger.print_error(log)
+        raise
+
+
+def create_nginx_cfg(
+    display_name: str,
+    cfg_name: str,
+    template_src: Path,
+    **kwargs,
+) -> None:
+    from utils.sys_utils import set_nginx_permissions
+
+    try:
+        Logger.print_status(f"Creating NGINX config for {display_name} ...")
+
+        source = NGINX_SITES_AVAILABLE.joinpath(cfg_name)
+        target = NGINX_SITES_ENABLED.joinpath(cfg_name)
+        remove_file(Path("/etc/nginx/sites-enabled/default"), True)
+        generate_nginx_cfg_from_template(cfg_name, template_src=template_src, **kwargs)
+        create_symlink(source, target, True)
+        set_nginx_permissions()
+
+        Logger.print_ok(f"NGINX config for {display_name} successfully created.")
+    except Exception:
+        Logger.print_error(f"Creating NGINX config for {display_name} failed!")
+        raise
+
+
+def read_ports_from_nginx_configs() -> List[int]:
+    """
+    Helper function to iterate over all NGINX configs and read all ports defined for listen
+    :return: A sorted list of listen ports
+    """
+    if not NGINX_SITES_ENABLED.exists():
+        return []
+
+    port_list = []
+    for config in NGINX_SITES_ENABLED.iterdir():
+        with open(config, "r") as cfg:
+            lines = cfg.readlines()
+
+        for line in lines:
+            line = line.replace("default_server", "")
+            line = re.sub(r"[;:\[\]]", "", line.strip())
+            if line.startswith("listen") and line.split()[-1] not in port_list:
+                port_list.append(line.split()[-1])
+
+    ports_to_ints_list = [int(port) for port in port_list]
+    return sorted(ports_to_ints_list, key=lambda x: int(x))
+
+
+def is_valid_port(port: int, ports_in_use: List[int]) -> bool:
+    return port not in ports_in_use
+
+
+def get_next_free_port(ports_in_use: List[int]) -> int:
+    valid_ports = set(range(80, 7125))
+    used_ports = set(map(int, ports_in_use))
+
+    return min(valid_ports - used_ports)
+
+
+def remove_nginx_config(name: str) -> None:
+    Logger.print_status(f"Removing NGINX config for {name.capitalize()} ...")
+    try:
+        remove_file(NGINX_SITES_AVAILABLE.joinpath(name), True)
+        remove_file(NGINX_SITES_ENABLED.joinpath(name), True)
+
+    except CalledProcessError as e:
+        log = f"Unable to remove NGINX config '{name}':\n{e.stderr.decode()}"
+        Logger.print_error(log)
+
+
+def remove_nginx_logs(name: str, instances: List[Klipper]) -> None:
+    Logger.print_status(f"Removing NGINX logs for {name.capitalize()} ...")
+    try:
+        remove_file(Path(f"/var/log/nginx/{name}-access.log"), True)
+        remove_file(Path(f"/var/log/nginx/{name}-error.log"), True)
+
+        if not instances:
+            return
+
+        for instance in instances:
+            remove_file(instance.log_dir.joinpath(f"{name}-access.log"))
+            remove_file(instance.log_dir.joinpath(f"{name}-error.log"))
+
+    except (OSError, CalledProcessError) as e:
+        Logger.print_error(f"Unable to remove NGINX logs:\n{e}")

kiauh/utils/git_utils.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import json
 import shutil
 import urllib.request
@@ -7,21 +5,16 @@ from http.client import HTTPResponse
 from json import JSONDecodeError
 from pathlib import Path
 from subprocess import DEVNULL, PIPE, CalledProcessError, check_output, run
-from typing import List, Type
+from typing import List, Optional, Type
 
+from core.instance_manager.base_instance import BaseInstance
 from core.instance_manager.instance_manager import InstanceManager
-from core.instance_type import InstanceType
-from core.logger import Logger
 from utils.input_utils import get_confirm, get_number_input
-from utils.instance_utils import get_instances
-
-
-class GitException(Exception):
-    pass
+from utils.logger import Logger
 
 
 def git_clone_wrapper(
-    repo: str, target_dir: Path, branch: str | None = None, force: bool = False
+    repo: str, target_dir: Path, branch: Optional[str] = None
 ) -> None:
     """
     Clones a repository from the given URL and checks out the specified branch if given.
@@ -29,7 +22,6 @@ def git_clone_wrapper(
     :param repo: The URL of the repository to clone.
     :param branch: The branch to check out. If None, the default branch will be checked out.
     :param target_dir: The directory where the repository will be cloned.
-    :param force: Force the cloning of the repository even if it already exists.
     :return: None
     """
     log = f"Cloning repository from '{repo}'"
@@ -37,7 +29,7 @@ def git_clone_wrapper(
     try:
         if Path(target_dir).exists():
             question = f"'{target_dir}' already exists. Overwrite?"
-            if not force and not get_confirm(question, default_choice=False):
+            if not get_confirm(question, default_choice=False):
                 Logger.print_info("Skip cloning of repository ...")
                 return
             shutil.rmtree(target_dir)
@@ -47,10 +39,10 @@ def git_clone_wrapper(
     except CalledProcessError:
         log = "An unexpected error occured during cloning of the repository."
         Logger.print_error(log)
-        raise GitException(log)
+        return
     except OSError as e:
         Logger.print_error(f"Error removing existing repository: {e.strerror}")
-        raise GitException(f"Error removing existing repository: {e.strerror}")
+        return
 
 
 def git_pull_wrapper(repo: str, target_dir: Path) -> None:
@@ -70,58 +62,24 @@ def git_pull_wrapper(repo: str, target_dir: Path) -> None:
         return
 
 
-def get_repo_name(repo: Path) -> tuple[str, str] | None:
+def get_repo_name(repo: Path) -> str:
     """
     Helper method to extract the organisation and name of a repository |
     :param repo: repository to extract the values from
-    :return: String in form of "<orga>/<name>" or None
+    :return: String in form of "<orga>/<name>"
     """
     if not repo.exists() or not repo.joinpath(".git").exists():
-        return "-", "-"
+        return "-"
 
     try:
-        cmd = ["git", "-C", repo.as_posix(), "config", "--get", "remote.origin.url"]
-        result: str = check_output(cmd, stderr=DEVNULL).decode(encoding="utf-8")
-        substrings: List[str] = result.strip().split("/")[-2:]
-        return substrings[0], substrings[1]
-
-        # return "/".join(substrings).replace(".git", "")
+        cmd = ["git", "-C", repo, "config", "--get", "remote.origin.url"]
+        result = check_output(cmd, stderr=DEVNULL)
+        return "/".join(result.decode().strip().split("/")[-2:])
     except CalledProcessError:
-        return None
+        return "-"
 
 
-def get_local_tags(repo_path: Path, _filter: str | None = None) -> List[str]:
-    """
-    Get all tags of a local Git repository
-    :param repo_path: Path to the local Git repository
-    :param _filter: Optional filter to filter the tags by
-    :return: List of tags
-    """
-    try:
-        cmd = ["git", "tag", "-l"]
-
-        if _filter is not None:
-            cmd.append(f"'${_filter}'")
-
-        result: str = check_output(
-            cmd,
-            stderr=DEVNULL,
-            cwd=repo_path.as_posix(),
-        ).decode(encoding="utf-8")
-
-        tags = result.split("\n")
-        return tags[:-1]
-
-    except CalledProcessError:
-        return []
-
-
-def get_remote_tags(repo_path: str) -> List[str]:
-    """
-    Gets the tags of a GitHub repostiory
-    :param repo_path: path of the GitHub repository - e.g. `<owner>/<name>`
-    :return: List of tags
-    """
+def get_tags(repo_path: str) -> List[str]:
     try:
         url = f"https://api.github.com/repos/{repo_path}/tags"
         with urllib.request.urlopen(url) as r:
@@ -139,18 +97,19 @@ def get_remote_tags(repo_path: str) -> List[str]:
         raise
 
 
-def get_latest_remote_tag(repo_path: str) -> str:
+def get_latest_tag(repo_path: str) -> str:
     """
     Gets the latest stable tag of a GitHub repostiory
     :param repo_path: path of the GitHub repository - e.g. `<owner>/<name>`
     :return: tag or empty string
     """
     try:
-        if len(latest_tag := get_remote_tags(repo_path)) > 0:
+        if len(latest_tag := get_tags(repo_path)) > 0:
             return latest_tag[0]
         else:
             return ""
     except Exception:
+        Logger.print_error("Error while getting the latest tag")
         raise
 
 
@@ -161,10 +120,7 @@ def get_latest_unstable_tag(repo_path: str) -> str:
     :return: tag or empty string
     """
     try:
-        if (
-            len(unstable_tags := [t for t in get_remote_tags(repo_path) if "-" in t])
-            > 0
-        ):
+        if len(unstable_tags := [t for t in get_tags(repo_path) if "-" in t]) > 0:
             return unstable_tags[0]
         else:
             return ""
@@ -173,48 +129,20 @@ def get_latest_unstable_tag(repo_path: str) -> str:
         raise
 
 
-def compare_semver_tags(tag1: str, tag2: str) -> bool:
-    """
-    Compare two semver version strings.
-    Does not support comparing pre-release versions (e.g. 1.0.0-rc.1, 1.0.0-beta.1)
-    :param tag1: First version string
-    :param tag2: Second version string
-    :return: True if tag1 is greater than tag2, False otherwise
-    """
-    if tag1 == tag2:
-        return False
-
-    def parse_version(v):
-        return list(map(int, v[1:].split(".")))
-
-    tag1_parts = parse_version(tag1)
-    tag2_parts = parse_version(tag2)
-
-    max_len = max(len(tag1_parts), len(tag2_parts))
-    tag1_parts += [0] * (max_len - len(tag1_parts))
-    tag2_parts += [0] * (max_len - len(tag2_parts))
-
-    for part1, part2 in zip(tag1_parts, tag2_parts):
-        if part1 != part2:
-            return part1 > part2
-
-    return False
-
-
-def get_local_commit(repo: Path) -> str | None:
+def get_local_commit(repo: Path) -> str:
     if not repo.exists() or not repo.joinpath(".git").exists():
-        return None
+        return "-"
 
     try:
         cmd = f"cd {repo} && git describe HEAD --always --tags | cut -d '-' -f 1,2"
         return check_output(cmd, shell=True, text=True).strip()
     except CalledProcessError:
-        return None
+        return "-"
 
 
-def get_remote_commit(repo: Path) -> str | None:
+def get_remote_commit(repo: Path) -> str:
     if not repo.exists() or not repo.joinpath(".git").exists():
-        return None
+        return "-"
 
     try:
         # get locally checked out branch
@@ -224,23 +152,22 @@ def get_remote_commit(repo: Path) -> str | None:
         cmd = f"cd {repo} && git describe 'origin/{branch}' --always --tags | cut -d '-' -f 1,2"
         return check_output(cmd, shell=True, text=True).strip()
     except CalledProcessError:
-        return None
+        return "-"
 
 
 def git_cmd_clone(repo: str, target_dir: Path) -> None:
     try:
-        command = ["git", "clone", repo, target_dir.as_posix()]
+        command = ["git", "clone", repo, target_dir]
         run(command, check=True)
 
         Logger.print_ok("Clone successful!")
     except CalledProcessError as e:
-        error = e.stderr.decode() if e.stderr else "Unknown error"
-        log = f"Error cloning repository {repo}: {error}"
+        log = f"Error cloning repository {repo}: {e.stderr.decode()}"
         Logger.print_error(log)
         raise
 
 
-def git_cmd_checkout(branch: str | None, target_dir: Path) -> None:
+def git_cmd_checkout(branch: str, target_dir: Path) -> None:
     if branch is None:
         return
 
@@ -265,15 +192,15 @@ def git_cmd_pull(target_dir: Path) -> None:
         raise
 
 
-def rollback_repository(repo_dir: Path, instance: Type[InstanceType]) -> None:
+def rollback_repository(repo_dir: Path, instance: Type[BaseInstance]) -> None:
     q1 = "How many commits do you want to roll back"
     amount = get_number_input(q1, 1, allow_go_back=True)
 
-    instances = get_instances(instance)
+    im = InstanceManager(instance)
 
     Logger.print_warn("Do not continue if you have ongoing prints!", start="\n")
     Logger.print_warn(
-        f"All currently running {instance.__name__} services will be stopped!"
+        f"All currently running {im.instance_type.__name__} services will be stopped!"
     )
     if not get_confirm(
         f"Roll back {amount} commit{'s' if amount > 1 else ''}",
@@ -283,7 +210,7 @@ def rollback_repository(repo_dir: Path, instance: Type[InstanceType]) -> None:
         Logger.print_info("Aborting roll back ...")
         return
 
-    InstanceManager.stop_all(instances)
+    im.stop_all_instance()
 
     try:
         cmd = ["git", "reset", "--hard", f"HEAD~{amount}"]
@@ -292,4 +219,4 @@ def rollback_repository(repo_dir: Path, instance: Type[InstanceType]) -> None:
     except CalledProcessError as e:
         Logger.print_error(f"An error occured during repo rollback:\n{e}")
 
-    InstanceManager.start_all(instances)
+    im.start_all_instance()

kiauh/utils/input_utils.py

@@ -6,16 +6,17 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
-
 import re
-from typing import Dict, List
+from typing import List, Union
 
-from core.constants import COLOR_CYAN, INVALID_CHOICE, RESET_FORMAT
-from core.logger import Logger
+from utils import INVALID_CHOICE
+from utils.constants import COLOR_CYAN, RESET_FORMAT
+from utils.logger import Logger
 
 
-def get_confirm(question: str, default_choice=True, allow_go_back=False) -> bool | None:
+def get_confirm(
+    question: str, default_choice=True, allow_go_back=False
+) -> Union[bool, None]:
     """
     Helper method for validating confirmation (yes/no) user input. |
     :param question: The question to display
@@ -52,10 +53,10 @@ def get_confirm(question: str, default_choice=True, allow_go_back=False) -> bool
 def get_number_input(
     question: str,
     min_count: int,
-    max_count: int | None = None,
-    default: int | None = None,
-    allow_go_back: bool = False,
-) -> int | None:
+    max_count=None,
+    default=None,
+    allow_go_back=False,
+) -> Union[int, None]:
     """
     Helper method to get a number input from the user
     :param question: The question to display
@@ -72,7 +73,7 @@ def get_number_input(
         if allow_go_back and _input in options_go_back:
             return None
 
-        if _input == "" and default is not None:
+        if _input == "":
             return default
 
         try:
@@ -83,10 +84,10 @@ def get_number_input(
 
 def get_string_input(
     question: str,
-    regex: str | None = None,
-    exclude: List[str] | None = None,
-    allow_special_chars: bool = False,
-    default: str | None = None,
+    regex: Union[str, None] = None,
+    exclude: Union[List, None] = None,
+    allow_special_chars=False,
+    default=None,
 ) -> str:
     """
     Helper method to get a string input from the user
@@ -103,6 +104,8 @@ def get_string_input(
     while True:
         _input = input(_question)
 
+        print(_input)
+
         if _input.lower() in _exclude:
             Logger.print_error("This value is already in use/reserved.")
         elif default is not None and _input == "":
@@ -117,7 +120,7 @@ def get_string_input(
             Logger.print_error(INVALID_CHOICE)
 
 
-def get_selection_input(question: str, option_list: List | Dict, default=None) -> str:
+def get_selection_input(question: str, option_list: List, default=None) -> str:
     """
     Helper method to get a selection from a list of options from the user
     :param question: The question to display
@@ -126,18 +129,12 @@ def get_selection_input(question: str, option_list: List | Dict, default=None) -
     :return: The option that was selected by the user
     """
     while True:
-        _input = input(format_question(question, default)).strip().lower()
+        _input = input(format_question(question, default)).strip()
 
-        if isinstance(option_list, list):
-            if _input in option_list:
-                return _input
-        elif isinstance(option_list, dict):
-            if _input in option_list.keys():
-                return _input
-        else:
-            raise ValueError("Invalid option_list type")
+        if _input in option_list:
+            return _input
 
-        Logger.print_error("Invalid option! Please select a valid option.", False)
+        Logger.print_error(INVALID_CHOICE)
 
 
 def format_question(question: str, default=None) -> str:
@@ -154,7 +151,7 @@ def format_question(question: str, default=None) -> str:
     return f"{COLOR_CYAN}###### {formatted_q}: {RESET_FORMAT}"
 
 
-def validate_number_input(value: str, min_count: int, max_count: int | None) -> int:
+def validate_number_input(value: str, min_count: int, max_count: int) -> int:
     """
     Helper method for a simple number input validation. |
     :param value: The value to validate

kiauh/utils/instance_utils.py

@@ -1,56 +0,0 @@
-# ======================================================================= #
-#  Copyright (C) 2020 - 2024 Dominik Willner <th33xitus@gmail.com>        #
-#                                                                         #
-#  This file is part of KIAUH - Klipper Installation And Update Helper    #
-#  https://github.com/dw-0/kiauh                                          #
-#                                                                         #
-#  This file may be distributed under the terms of the GNU GPLv3 license  #
-# ======================================================================= #
-from __future__ import annotations
-
-import re
-from pathlib import Path
-from typing import List
-
-from core.constants import SYSTEMD
-from core.instance_manager.base_instance import SUFFIX_BLACKLIST
-from core.instance_type import InstanceType
-
-
-def get_instances(instance_type: type) -> List[InstanceType]:
-    from utils.common import convert_camelcase_to_kebabcase
-
-    if not isinstance(instance_type, type):
-        raise ValueError("instance_type must be a class")
-
-    name = convert_camelcase_to_kebabcase(instance_type.__name__)
-    pattern = re.compile(f"^{name}(-[0-9a-zA-Z]+)?.service$")
-
-    service_list = [
-        Path(SYSTEMD, service)
-        for service in SYSTEMD.iterdir()
-        if pattern.search(service.name)
-        and not any(s in service.name for s in SUFFIX_BLACKLIST)
-    ]
-
-    instance_list = [
-        instance_type(get_instance_suffix(name, service)) for service in service_list
-    ]
-
-    def _sort_instance_list(suffix: int | str | None):
-        if suffix is None:
-            return
-        elif isinstance(suffix, str) and suffix.isdigit():
-            return f"{int(suffix):04}"
-        else:
-            return suffix
-
-    return sorted(instance_list, key=lambda x: _sort_instance_list(x.suffix))
-
-
-def get_instance_suffix(name: str, file_path: Path) -> str:
-    # to get the suffix of the instance, we remove the name of the instance from
-    # the file name, if the remaining part an empty string we return it
-    # otherwise there is and hyphen left, and we return the part after the hyphen
-    suffix = file_path.stem[len(name) :]
-    return suffix[1:] if suffix else ""

kiauh/utils/logger.py

@@ -6,13 +6,11 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
-
 import textwrap
 from enum import Enum
 from typing import List
 
-from core.constants import (
+from utils.constants import (
     COLOR_CYAN,
     COLOR_GREEN,
     COLOR_MAGENTA,
@@ -46,17 +44,17 @@ LINE_WIDTH = 53
 
 class Logger:
     @staticmethod
-    def info(msg) -> None:
+    def info(msg):
         # log to kiauh.log
         pass
 
     @staticmethod
-    def warn(msg) -> None:
+    def warn(msg):
         # log to kiauh.log
         pass
 
     @staticmethod
-    def error(msg) -> None:
+    def error(msg):
         # log to kiauh.log
         pass
 
@@ -66,7 +64,7 @@ class Logger:
         print(f"{COLOR_WHITE}{start}{message}{RESET_FORMAT}", end=end)
 
     @staticmethod
-    def print_ok(msg: str = "Success!", prefix=True, start="", end="\n") -> None:
+    def print_ok(msg, prefix=True, start="", end="\n") -> None:
         message = f"[OK] {msg}" if prefix else msg
         print(f"{COLOR_GREEN}{start}{message}{RESET_FORMAT}", end=end)
 
@@ -90,25 +88,10 @@ class Logger:
         title: DialogType,
         content: List[str],
         center_content: bool = False,
-        custom_title: str | None = None,
-        custom_color: DialogCustomColor | None = None,
-        margin_top: int = 0,
-        margin_bottom: int = 0,
+        custom_title: str = None,
+        custom_color: DialogCustomColor = None,
+        end: str = "\n",
     ) -> None:
-        """
-        Prints a dialog with the given title and content.
-        Those dialogs should be used to display verbose messages to the user which
-        require simple interaction like confirmation or input. Do not use this for
-        navigating through the application.
-
-        :param title: The type of the dialog.
-        :param content: The content of the dialog.
-        :param center_content: Whether to center the content or not.
-        :param custom_title: A custom title for the dialog.
-        :param custom_color: A custom color for the dialog.
-        :param margin_top: The number of empty lines to print before the dialog.
-        :param margin_bottom: The number of empty lines to print after the dialog.
-        """
         dialog_color = Logger._get_dialog_color(title, custom_color)
         dialog_title = Logger._get_dialog_title(title, custom_title)
         dialog_title_formatted = Logger._format_dialog_title(dialog_title)
@@ -116,44 +99,43 @@ class Logger:
         top = Logger._format_top_border(dialog_color)
         bottom = Logger._format_bottom_border()
 
-        print("\n" * margin_top)
         print(
             f"{top}{dialog_title_formatted}{dialog_content}{bottom}",
-            end="",
+            end=end,
         )
-        print("\n" * margin_bottom)
 
     @staticmethod
-    def _get_dialog_title(
-        title: DialogType, custom_title: str | None = None
-    ) -> str | None:
+    def _get_dialog_title(title: DialogType, custom_title: str = None) -> str:
         if title == DialogType.CUSTOM and custom_title:
             return f"[ {custom_title} ]"
         return f"[ {title.value[0]} ]" if title.value[0] else None
 
     @staticmethod
     def _get_dialog_color(
-        title: DialogType, custom_color: DialogCustomColor | None = None
+        title: DialogType, custom_color: DialogCustomColor = None
     ) -> str:
         if title == DialogType.CUSTOM and custom_color:
             return str(custom_color.value)
-
-        color: str = title.value[1] if title.value[1] else DialogCustomColor.WHITE.value
-
-        return color
+        return title.value[1] if title.value[1] else DialogCustomColor.WHITE.value
 
     @staticmethod
     def _format_top_border(color: str) -> str:
-        return f"{color}┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓"
+        return textwrap.dedent(
+            f"""
+            {color}┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+            """
+        )[1:-1]
 
     @staticmethod
     def _format_bottom_border() -> str:
-        return (
-            f"\n┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛{RESET_FORMAT}"
+        return textwrap.dedent(
+            f"""
+            ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+            {RESET_FORMAT}"""
         )
 
     @staticmethod
-    def _format_dialog_title(title: str | None) -> str:
+    def _format_dialog_title(title: str) -> str:
         if title is not None:
             return textwrap.dedent(f"""
                 ┃ {title:^{LINE_WIDTH}} ┃

kiauh/utils/sys_utils.py

@@ -6,7 +6,6 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
 
 import os
 import re
@@ -17,14 +16,15 @@ import sys
 import time
 import urllib.error
 import urllib.request
+import venv
 from pathlib import Path
-from subprocess import DEVNULL, PIPE, CalledProcessError, Popen, check_output, run
-from typing import List, Literal, Set
+from subprocess import DEVNULL, PIPE, CalledProcessError, Popen, run
+from typing import List, Literal
 
-from core.constants import SYSTEMD
-from core.logger import Logger
-from utils.fs_utils import check_file_exist, remove_with_sudo
+from utils.constants import SYSTEMD
+from utils.fs_utils import check_file_exist
 from utils.input_utils import get_confirm
+from utils.logger import Logger
 
 SysCtlServiceAction = Literal[
     "start",
@@ -39,10 +39,6 @@ SysCtlServiceAction = Literal[
 SysCtlManageAction = Literal["daemon-reload", "reset-failed"]
 
 
-class VenvCreationFailedException(Exception):
-    pass
-
-
 def kill(opt_err_msg: str = "") -> None:
     """
     Kills the application |
@@ -91,40 +87,34 @@ def parse_packages_from_file(source_file: Path) -> List[str]:
     return packages
 
 
-def create_python_venv(target: Path, force: bool = False) -> bool:
+def create_python_venv(target: Path) -> None:
     """
-    Create a python 3 virtualenv at the provided target destination.
-    Returns True if the virtualenv was created successfully.
-    Returns False if the virtualenv already exists, recreation was declined or creation failed.
-    :param force: Force recreation of the virtualenv
+    Create a python 3 virtualenv at the provided target destination |
     :param target: Path where to create the virtualenv at
-    :return: bool
+    :return: None
     """
     Logger.print_status("Set up Python virtual environment ...")
     if not target.exists():
         try:
-            cmd = ["virtualenv", "-p", "/usr/bin/python3", target.as_posix()]
-            run(cmd, check=True)
+            venv.create(target, with_pip=True)
             Logger.print_ok("Setup of virtualenv successful!")
-            return True
-        except CalledProcessError as e:
-            Logger.print_error(f"Error setting up virtualenv:\n{e}")
-            return False
-    else:
-        if not force and not get_confirm(
-            "Virtualenv already exists. Re-create?", default_choice=False
-        ):
-            Logger.print_info("Skipping re-creation of virtualenv ...")
-            return False
-
-        try:
-            shutil.rmtree(target)
-            create_python_venv(target)
-            return True
         except OSError as e:
-            log = f"Error removing existing virtualenv: {e.strerror}"
-            Logger.print_error(log, False)
-            return False
+            Logger.print_error(f"Error setting up virtualenv:\n{e}")
+            raise
+        except CalledProcessError as e:
+            Logger.print_error(f"Error setting up virtualenv:\n{e.output.decode()}")
+            raise
+    else:
+        if get_confirm("Virtualenv already exists. Re-create?", default_choice=False):
+            try:
+                shutil.rmtree(target)
+                create_python_venv(target)
+            except OSError as e:
+                log = f"Error removing existing virtualenv: {e.strerror}"
+                Logger.print_error(log, False)
+                raise
+        else:
+            Logger.print_info("Skipping re-creation of virtualenv ...")
 
 
 def update_python_pip(target: Path) -> None:
@@ -135,13 +125,12 @@ def update_python_pip(target: Path) -> None:
     """
     Logger.print_status("Updating pip ...")
     try:
-        pip_location: Path = target.joinpath("bin/pip")
-        pip_exists: bool = check_file_exist(pip_location)
-
+        pip_location = target.joinpath("bin/pip")
+        pip_exists = check_file_exist(pip_location)
         if not pip_exists:
             raise FileNotFoundError("Error updating pip! Not found.")
 
-        command = [pip_location.as_posix(), "install", "-U", "pip"]
+        command = [pip_location, "install", "-U", "pip"]
         result = run(command, stderr=PIPE, text=True)
         if result.returncode != 0 or result.stderr:
             Logger.print_error(f"{result.stderr}", False)
@@ -170,7 +159,7 @@ def install_python_requirements(target: Path, requirements: Path) -> None:
 
         Logger.print_status("Installing Python requirements ...")
         command = [
-            target.joinpath("bin/pip").as_posix(),
+            target.joinpath("bin/pip"),
             "install",
             "-r",
             f"{requirements}",
@@ -179,14 +168,14 @@ def install_python_requirements(target: Path, requirements: Path) -> None:
 
         if result.returncode != 0 or result.stderr:
             Logger.print_error(f"{result.stderr}", False)
-            raise VenvCreationFailedException("Installing Python requirements failed!")
+            Logger.print_error("Installing Python requirements failed!")
+            return
 
         Logger.print_ok("Installing Python requirements successful!")
-
-    except Exception as e:
-        log = f"Error installing Python requirements: {e}"
+    except CalledProcessError as e:
+        log = f"Error installing Python requirements:\n{e.output.decode()}"
         Logger.print_error(log)
-        raise VenvCreationFailedException(log)
+        raise
 
 
 def update_system_package_lists(silent: bool, rls_info_change=False) -> None:
@@ -196,8 +185,8 @@ def update_system_package_lists(silent: bool, rls_info_change=False) -> None:
     :param rls_info_change: Flag for "--allow-releaseinfo-change"
     :return: None
     """
-    cache_mtime: float = 0
-    cache_files: List[Path] = [
+    cache_mtime = 0
+    cache_files = [
         Path("/var/lib/apt/periodic/update-success-stamp"),
         Path("/var/lib/apt/lists"),
     ]
@@ -231,26 +220,7 @@ def update_system_package_lists(silent: bool, rls_info_change=False) -> None:
         raise
 
 
-def get_upgradable_packages() -> List[str]:
-    """
-    Reads all system packages that can be upgraded.
-    :return: A list of package names available for upgrade
-    """
-    try:
-        command = ["apt", "list", "--upgradable"]
-        output: str = check_output(command, stderr=DEVNULL, text=True, encoding="utf-8")
-        pkglist = []
-        for line in output.split("\n"):
-            if "/" not in line:
-                continue
-            pkg = line.split("/")[0]
-            pkglist.append(pkg)
-        return pkglist
-    except CalledProcessError as e:
-        raise Exception(f"Error reading upgradable packages: {e}")
-
-
-def check_package_install(packages: Set[str]) -> List[str]:
+def check_package_install(packages: List[str]) -> List[str]:
     """
     Checks the system for installed packages |
     :param packages: List of strings of package names
@@ -283,29 +253,12 @@ def install_system_packages(packages: List[str]) -> None:
             command.append(pkg)
         run(command, stderr=PIPE, check=True)
 
-        Logger.print_ok("Packages successfully installed.")
+        Logger.print_ok("Packages installed successfully.")
     except CalledProcessError as e:
         Logger.print_error(f"Error installing packages:\n{e.stderr.decode()}")
         raise
 
 
-def upgrade_system_packages(packages: List[str]) -> None:
-    """
-    Updates a list of system packages |
-    :param packages: List of system package names
-    :return: None
-    """
-    try:
-        command = ["sudo", "apt-get", "upgrade", "-y"]
-        for pkg in packages:
-            command.append(pkg)
-        run(command, stderr=PIPE, check=True)
-
-        Logger.print_ok("Packages successfully upgraded.")
-    except CalledProcessError as e:
-        raise Exception(f"Error upgrading packages:\n{e.stderr.decode()}")
-
-
 # this feels hacky and not quite right, but for now it works
 # see: https://stackoverflow.com/questions/166506/finding-local-ip-addresses-using-pythons-stdlib
 def get_ipv4_addr() -> str:
@@ -319,7 +272,7 @@ def get_ipv4_addr() -> str:
     try:
         # doesn't even have to be reachable
         s.connect(("192.255.255.255", 1))
-        return str(s.getsockname()[0])
+        return s.getsockname()[0]
     except Exception:
         return "127.0.0.1"
     finally:
@@ -379,9 +332,9 @@ def set_nginx_permissions() -> None:
     """
     cmd = f"ls -ld {Path.home()} | cut -d' ' -f1"
     homedir_perm = run(cmd, shell=True, stdout=PIPE, text=True)
-    permissions = homedir_perm.stdout
+    homedir_perm = homedir_perm.stdout
 
-    if permissions.count("x") < 3:
+    if homedir_perm.count("x") < 3:
         Logger.print_status("Granting NGINX the required permissions ...")
         run(["chmod", "og+x", Path.home()])
         Logger.print_ok("Permissions granted.")
@@ -413,18 +366,15 @@ def cmd_sysctl_manage(action: SysCtlManageAction) -> None:
         raise
 
 
-def unit_file_exists(
-    name: str, suffix: Literal["service", "timer"], exclude: List[str] | None = None
-) -> bool:
+def service_instance_exists(name: str, exclude: List[str] = None) -> bool:
     """
-    Checks if a systemd unit file of the provided suffix exists.
-    :param name: the name of the unit file
-    :param suffix: suffix of the unit file, either "service" or "timer"
-    :param exclude: List of strings of names to exclude
-    :return: True if the unit file exists, False otherwise
+    Checks if a systemd service instance exists.
+    :param name: the service name
+    :param exclude: List of strings of service names to exclude
+    :return: True if the service exists, False otherwise
     """
     exclude = exclude or []
-    pattern = re.compile(f"^{name}(-[0-9a-zA-Z]+)?.{suffix}$")
+    pattern = re.compile(f"^{name}(-[0-9a-zA-Z]+)?.service$")
     service_list = [
         Path(SYSTEMD, service)
         for service in SYSTEMD.iterdir()
@@ -440,94 +390,15 @@ def log_process(process: Popen) -> None:
     :return: None
     """
     while True:
-        if process.stdout is not None:
-            reads = [process.stdout.fileno()]
-            ret = select.select(reads, [], [])
-            for fd in ret[0]:
-                if fd == process.stdout.fileno():
-                    line = process.stdout.readline()
-                    if line:
-                        print(line.strip(), flush=True)
-                    else:
-                        break
+        reads = [process.stdout.fileno()]
+        ret = select.select(reads, [], [])
+        for fd in ret[0]:
+            if fd == process.stdout.fileno():
+                line = process.stdout.readline()
+                if line:
+                    print(line.strip(), flush=True)
+                else:
+                    break
 
         if process.poll() is not None:
             break
-
-
-def create_service_file(name: str, content: str) -> None:
-    """
-    Creates a service file at the provided path with the provided content.
-    :param name: the name of the service file
-    :param content: the content of the service file
-    :return: None
-    """
-    try:
-        run(
-            ["sudo", "tee", SYSTEMD.joinpath(name)],
-            input=content.encode(),
-            stdout=DEVNULL,
-            check=True,
-        )
-        Logger.print_ok(f"Service file created: {SYSTEMD.joinpath(name)}")
-    except CalledProcessError as e:
-        Logger.print_error(f"Error creating service file: {e}")
-        raise
-
-
-def create_env_file(path: Path, content: str) -> None:
-    """
-    Creates an env file at the provided path with the provided content.
-    :param path: the path of the env file
-    :param content: the content of the env file
-    :return: None
-    """
-    try:
-        with open(path, "w") as env_file:
-            env_file.write(content)
-        Logger.print_ok(f"Env file created: {path}")
-    except OSError as e:
-        Logger.print_error(f"Error creating env file: {e}")
-        raise
-
-
-def remove_system_service(service_name: str) -> None:
-    """
-    Disables and removes a systemd service
-    :param service_name: name of the service unit file - must end with '.service'
-    :return: None
-    """
-    try:
-        if not service_name.endswith(".service"):
-            raise ValueError(f"service_name '{service_name}' must end with '.service'")
-
-        file: Path = SYSTEMD.joinpath(service_name)
-        if not file.exists() or not file.is_file():
-            Logger.print_info(f"Service '{service_name}' does not exist! Skipped ...")
-            return
-
-        Logger.print_status(f"Removing {service_name} ...")
-        cmd_sysctl_service(service_name, "stop")
-        cmd_sysctl_service(service_name, "disable")
-        remove_with_sudo(file)
-        cmd_sysctl_manage("daemon-reload")
-        cmd_sysctl_manage("reset-failed")
-        Logger.print_ok(f"{service_name} successfully removed!")
-    except Exception as e:
-        Logger.print_error(f"Error removing {service_name}: {e}")
-        raise
-
-
-def get_service_file_path(instance_type: type, suffix: str) -> Path:
-    from utils.common import convert_camelcase_to_kebabcase
-
-    if not isinstance(instance_type, type):
-        raise ValueError("instance_type must be a class")
-
-    name: str = convert_camelcase_to_kebabcase(instance_type.__name__)
-    if suffix != "":
-        name += f"-{suffix}"
-
-    file_path: Path = SYSTEMD.joinpath(f"{name}.service")
-
-    return file_path

kiauh/utils/types.py

@@ -6,25 +6,25 @@
 #                                                                         #
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
-from __future__ import annotations
-
-from dataclasses import dataclass
-from typing import Dict, Literal
-
-StatusText = Literal["Installed", "Not installed", "Incomplete"]
-StatusCode = Literal[0, 1, 2]
-StatusMap: Dict[StatusCode, StatusText] = {
-    0: "Not installed",
-    1: "Incomplete",
-    2: "Installed",
-}
+from enum import Enum
+from typing import Optional, TypedDict
 
 
-@dataclass
-class ComponentStatus:
-    status: StatusCode
-    owner: str | None = None
-    repo: str | None = None
-    local: str | None = None
-    remote: str | None = None
-    instances: int | None = None
+class StatusInfo:
+    def __init__(self, txt: str, code: int):
+        self.txt: str = txt
+        self.code: int = code
+
+
+class InstallStatus(Enum):
+    INSTALLED = StatusInfo("Installed", 1)
+    NOT_INSTALLED = StatusInfo("Not installed", 2)
+    INCOMPLETE = StatusInfo("Incomplete", 3)
+
+
+class ComponentStatus(TypedDict):
+    status: InstallStatus
+    repo: Optional[str]
+    local: Optional[str]
+    remote: Optional[str]
+    instances: Optional[int]

pyproject.toml

@@ -2,7 +2,7 @@
 requires-python = ">=3.8"
 
 [project.optional-dependencies]
-dev=["ruff", "mypy"]
+dev=["ruff"]
 
 [tool.ruff]
 required-version = ">=0.3.4"
@@ -19,14 +19,3 @@ quote-style = "double"
 
 [tool.ruff.lint]
 extend-select = ["I"]
-
-[tool.mypy]
-python_version = "3.8"
-platform = "linux"
-# strict = true # TODO: enable this once everything is else is handled
-check_untyped_defs = true
-ignore_missing_imports = true
-warn_redundant_casts = true
-warn_unused_ignores = true
-warn_return_any = true
-warn_unreachable = true

scripts/backup.sh

@@ -45,13 +45,13 @@ function backup_config_dir() {
     for folder in ${config_pathes}; do
       if [[ -d ${folder} ]]; then
         status_msg "Create backup of ${folder} ..."
-
+  
         folder_name=$(echo "${folder}" | rev | cut -d"/" -f2 | rev)
         target_dir="${BACKUP_DIR}/configs/${current_date}/${folder_name}"
         mkdir -p "${target_dir}"
         cp -r "${folder}" "${target_dir}"
         i=$(( i + 1 ))
-
+  
         ok_msg "Backup created in:\n${target_dir}"
       fi
     done
@@ -213,19 +213,3 @@ function backup_octoeverywhere() {
     print_error "Can't back up OctoEverywhere directory!\n Not found!"
   fi
 }
-
-function backup_spoolman() {
-  local current_date
-
-  if [[ -d ${SPOOLMAN_DIR} ]] ; then
-    status_msg "Creating Spoolman backup ..."
-    check_for_backup_dir
-    current_date=$(get_date)
-    status_msg "Timestamp: ${current_date}"
-    mkdir -p "${BACKUP_DIR}/Spoolman-backups/${current_date}"
-    cp -r "${SPOOLMAN_DIR}" "${_}" && cp -r "${SPOOLMAN_DB_DIR}/spoolman.db" "${_}"
-    print_confirm "Spoolman backup complete!"
-  else
-    print_error "Can't back up Spoolman directory!\n Not found!"
-  fi
-}

scripts/fluidd.sh

@@ -37,7 +37,7 @@ function install_fluidd() {
   fi
 
   ### checking dependencies
-  local dep=(wget nginx unzip)
+  local dep=(wget nginx)
   dependency_check "${dep[@]}"
   ### detect conflicting Haproxy and Apache2 installations
   detect_conflicting_packages

scripts/globals.sh

@@ -87,9 +87,4 @@ function set_globals() {
   OCTOAPP_ENV="${HOME}/octoapp-env"
   OCTOAPP_DIR="${HOME}/octoapp"
   OCTOAPP_REPO="https://github.com/crysxd/OctoApp-Plugin.git"
-
-  #=============== Spoolman ================#
-  SPOOLMAN_DIR="${HOME}/Spoolman"
-  SPOOLMAN_DB_DIR="${HOME}/.local/share/spoolman"
-  SPOOLMAN_REPO="https://api.github.com/repos/Donkie/Spoolman/releases/latest"
 }

scripts/mainsail.sh

@@ -37,7 +37,7 @@ function install_mainsail() {
   fi
 
   ### checking dependencies
-  local dep=(wget nginx unzip)
+  local dep=(wget nginx)
   dependency_check "${dep[@]}"
   ### detect conflicting Haproxy and Apache2 installations
   detect_conflicting_packages