Merge 89a9d38d39 into 1b5691f2f5

default.kiauh.cfg

@@ -14,5 +14,5 @@ port: 80
 unstable_releases: False
 
 [fluidd]
-port: 80
+port: 81
 unstable_releases: False

kiauh.py

@@ -9,13 +9,7 @@
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
 
-import io
-import sys
-
 from kiauh.main import main
 
-# ensure that all output is utf-8 encoded
-sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding="utf-8")
-
 if __name__ == "__main__":
     main()

kiauh.sh

@@ -10,7 +10,7 @@
 #=======================================================================#
 
 set -e
-clear -x
+clear
 
 # make sure we have the correct permissions while running the script
 umask 022
@@ -110,7 +110,7 @@ function launch_kiauh_v6() {
 
   export PYTHONPATH="${entrypoint}"
 
-  clear -x
+  clear
   python3 "${entrypoint}/kiauh.py"
 }
 

kiauh/components/klipper_firmware/firmware_utils.py

@@ -90,21 +90,6 @@ def find_usb_dfu_device() -> List[str]:
         return []
 
 
-def find_usb_rp2_boot_device() -> List[str]:
-    try:
-        output = check_output("lsusb", shell=True, text=True, stderr=DEVNULL)
-        device_list = []
-        if output:
-            devices = output.splitlines()
-            device_list = [d.split(" ")[5] for d in devices if "RP2 Boot" in d]
-        return device_list
-
-    except CalledProcessError as e:
-        Logger.print_error("Unable to find a USB RP2 Boot device!")
-        Logger.print_error(e, prefix=False)
-        return []
-
-
 def get_sd_flash_board_list() -> List[str]:
     if not KLIPPER_DIR.exists() or not SD_FLASH_SCRIPT.exists():
         return []

kiauh/components/klipper_firmware/flash_options.py

@@ -26,7 +26,6 @@ class FlashCommand(Enum):
 class ConnectionType(Enum):
     USB = "USB"
     USB_DFU = "USB (DFU)"
-    USB_RP2040 = "USB (RP2040)"
     UART = "UART"
 
 

kiauh/components/klipper_firmware/menus/klipper_flash_help_menu.py

@@ -143,8 +143,6 @@ class KlipperMcuConnectionHelpMenu(BaseMenu):
         count = 62 - len(color) - len(RESET_FORMAT)
         subheader1 = f"{COLOR_CYAN}USB:{RESET_FORMAT}"
         subheader2 = f"{COLOR_CYAN}UART:{RESET_FORMAT}"
-        subheader3 = f"{COLOR_CYAN}USB DFU:{RESET_FORMAT}"
-        subheader4 = f"{COLOR_CYAN}USB RP2040 Boot:{RESET_FORMAT}"
         menu = textwrap.dedent(
             f"""
             ╔═══════════════════════════════════════════════════════╗
@@ -166,19 +164,6 @@ class KlipperMcuConnectionHelpMenu(BaseMenu):
             ║ port your controller board is connected to when using ║
             ║ this connection method.                               ║
             ║                                                       ║
-            ║ {subheader3:<62} ║
-            ║ Selecting USB DFU as the connection method will scan  ║
-            ║ the USB ports for connected controller boards in      ║
-            ║ STM32 DFU mode, which is usually done by holding down ║
-            ║ the BOOT button or setting a special jumper on the    ║
-            ║ board before powering up.                             ║
-            ║                                                       ║
-            ║ {subheader4:<62} ║
-            ║ Selecting USB RP2 Boot as the connection method will  ║
-            ║ scan the USB ports for connected RP2040 controller    ║
-            ║ boards in Boot mode, which is usually done by holding ║
-            ║ down the BOOT button before powering up.              ║
-            ║                                                       ║
             ╟───────────────────────────────────────────────────────╢
             """
         )[1:]

kiauh/components/klipper_firmware/menus/klipper_flash_menu.py

@@ -17,7 +17,6 @@ from components.klipper_firmware.firmware_utils import (
     find_uart_device,
     find_usb_device_by_id,
     find_usb_dfu_device,
-    find_usb_rp2_boot_device,
     get_sd_flash_board_list,
     start_flash_process,
 )
@@ -178,7 +177,6 @@ class KlipperSelectMcuConnectionMenu(BaseMenu):
             "1": Option(method=self.select_usb),
             "2": Option(method=self.select_dfu),
             "3": Option(method=self.select_usb_dfu),
-            "4": Option(method=self.select_usb_rp2040),
         }
 
     def print_menu(self) -> None:
@@ -195,7 +193,6 @@ class KlipperSelectMcuConnectionMenu(BaseMenu):
             ║ 1) USB                                                ║
             ║ 2) UART                                               ║
             ║ 3) USB (DFU mode)                                     ║
-            ║ 4) USB (RP2040 mode)                                  ║
             ╟───────────────────────────┬───────────────────────────╢
             """
         )[1:]
@@ -213,10 +210,6 @@ class KlipperSelectMcuConnectionMenu(BaseMenu):
         self.flash_options.connection_type = ConnectionType.USB_DFU
         self.get_mcu_list()
 
-    def select_usb_rp2040(self, **kwargs):
-        self.flash_options.connection_type = ConnectionType.USB_RP2040
-        self.get_mcu_list()
-
     def get_mcu_list(self, **kwargs):
         conn_type = self.flash_options.connection_type
 
@@ -229,9 +222,6 @@ class KlipperSelectMcuConnectionMenu(BaseMenu):
         elif conn_type is ConnectionType.USB_DFU:
             Logger.print_status("Identifying MCU connected via USB in DFU mode ...")
             self.flash_options.mcu_list = find_usb_dfu_device()
-        elif conn_type is ConnectionType.USB_RP2040:
-            Logger.print_status("Identifying MCU connected via USB in RP2 Boot mode ...")
-            self.flash_options.mcu_list = find_usb_rp2_boot_device()
 
         if len(self.flash_options.mcu_list) < 1:
             Logger.print_warn("No MCUs found!")

kiauh/components/webui_client/client_config/client_config_setup.py

@@ -34,7 +34,7 @@ from utils.input_utils import get_confirm
 from utils.instance_utils import get_instances
 
 
-def install_client_config(client_data: BaseWebClient, cfg_backup=True) -> None:
+def install_client_config(client_data: BaseWebClient) -> None:
     client_config: BaseWebClientConfig = client_data.client_config
     display_name = client_config.display_name
 
@@ -56,8 +56,7 @@ def install_client_config(client_data: BaseWebClient, cfg_backup=True) -> None:
         download_client_config(client_config)
         create_client_config_symlink(client_config, kl_instances)
 
-        if cfg_backup:
-            backup_printer_config_dir()
+        backup_printer_config_dir()
 
         add_config_section(
             section=f"update_manager {client_config.name}",

kiauh/components/webui_client/client_dialogs.py

@@ -13,15 +13,15 @@ from components.webui_client.base_data import BaseWebClient
 from core.logger import DialogType, Logger
 
 
-def print_moonraker_not_found_dialog(name: str) -> None:
+def print_moonraker_not_found_dialog() -> None:
     Logger.print_dialog(
         DialogType.WARNING,
         [
             "No local Moonraker installation was found!",
             "\n\n",
-            f"It is possible to install {name} without a local Moonraker installation. "
+            "It is possible to install Mainsail without a local Moonraker installation. "
             "If you continue, you need to make sure, that Moonraker is installed on "
-            f"another machine in your network. Otherwise {name} will NOT work "
+            "another machine in your network. Otherwise Mainsail will NOT work "
             "correctly.",
         ],
     )
@@ -40,25 +40,20 @@ def print_client_already_installed_dialog(name: str) -> None:
 def print_client_port_select_dialog(
     name: str, port: int, ports_in_use: List[int]
 ) -> None:
-    dialog_content: List[str] = [
-        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!",
-    ]
-
-    if ports_in_use:
-        dialog_content.extend(
-            [
-                "\n\n",
-                "The following ports were found to be already in use:",
-                *[f"● {p}" for p in ports_in_use if p != port],
-            ]
-        )
-
-    Logger.print_dialog(DialogType.CUSTOM, dialog_content)
+    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_install_client_config_dialog(client: BaseWebClient) -> None:

kiauh/components/webui_client/client_setup.py

@@ -23,6 +23,7 @@ from components.webui_client.client_config.client_config_setup import (
     install_client_config,
 )
 from components.webui_client.client_dialogs import (
+    print_client_port_select_dialog,
     print_install_client_config_dialog,
     print_moonraker_not_found_dialog,
 )
@@ -32,16 +33,18 @@ from components.webui_client.client_utils import (
     create_nginx_cfg,
     detect_client_cfg_conflict,
     enable_mainsail_remotemode,
-    get_client_port_selection,
+    get_next_free_port,
+    is_valid_port,
+    read_ports_from_nginx_configs,
     symlink_webui_nginx_log,
 )
 from core.instance_manager.instance_manager import InstanceManager
-from core.logger import DialogCustomColor, DialogType, Logger
+from core.logger import Logger
 from core.settings.kiauh_settings import KiauhSettings
-from utils.common import backup_printer_config_dir, check_install_dependencies
+from utils.common import check_install_dependencies
 from utils.config_utils import add_config_section
 from utils.fs_utils import unzip
-from utils.input_utils import get_confirm
+from utils.input_utils import get_confirm, get_number_input
 from utils.instance_utils import get_instances
 from utils.sys_utils import (
     cmd_sysctl_service,
@@ -50,16 +53,21 @@ from utils.sys_utils import (
 )
 
 
-def install_client(
-    client: BaseWebClient,
-    settings: KiauhSettings,
-    reinstall: bool = False,
-) -> None:
+def install_client(client: BaseWebClient) -> None:
+    if client is None:
+        raise ValueError("Missing parameter client_data!")
+
+    if client.client_dir.exists():
+        Logger.print_info(
+            f"{client.display_name} seems to be already installed! Skipped ..."
+        )
+        return
+
     mr_instances: List[Moonraker] = get_instances(Moonraker)
 
     enable_remotemode = False
     if not mr_instances:
-        print_moonraker_not_found_dialog(client.display_name)
+        print_moonraker_not_found_dialog()
         if not get_confirm(f"Continue {client.display_name} installation?"):
             return
 
@@ -84,10 +92,21 @@ def install_client(
         question = f"Download the recommended {client_config.display_name}?"
         install_client_cfg = get_confirm(question, allow_go_back=False)
 
-    default_port: int = int(settings.get(client.name, "port"))
-    port: int = (
-        default_port if reinstall else get_client_port_selection(client, settings)
-    )
+    settings = KiauhSettings()
+    port: int = settings.get(client.name, "port")
+    ports_in_use: List[int] = read_ports_from_nginx_configs()
+
+    # check if configured port is a valid number and not in use already
+    valid_port = is_valid_port(port, ports_in_use)
+    while not valid_port:
+        next_port = get_next_free_port(ports_in_use)
+        print_client_port_select_dialog(client.display_name, next_port, ports_in_use)
+        port = get_number_input(
+            f"Configure {client.display_name} for port",
+            min_count=int(next_port),
+            default=next_port,
+        )
+        valid_port = is_valid_port(port, ports_in_use)
 
     check_install_dependencies({"nginx"})
 
@@ -95,22 +114,20 @@ def install_client(
         download_client(client)
         if enable_remotemode and client.client == WebClientType.MAINSAIL:
             enable_mainsail_remotemode()
-
-        backup_printer_config_dir()
-        add_config_section(
-            section=f"update_manager {client.name}",
-            instances=mr_instances,
-            options=[
-                ("type", "web"),
-                ("channel", "stable"),
-                ("repo", str(client.repo_path)),
-                ("path", str(client.client_dir)),
-            ],
-        )
-        InstanceManager.restart_all(mr_instances)
-
+        if mr_instances:
+            add_config_section(
+                section=f"update_manager {client.name}",
+                instances=mr_instances,
+                options=[
+                    ("type", "web"),
+                    ("channel", "stable"),
+                    ("repo", str(client.repo_path)),
+                    ("path", str(client.client_dir)),
+                ],
+            )
+            InstanceManager.restart_all(mr_instances)
         if install_client_cfg and kl_instances:
-            install_client_config(client, False)
+            install_client_config(client)
 
         copy_upstream_nginx_cfg()
         copy_common_vars_nginx_cfg()
@@ -128,24 +145,12 @@ def install_client(
         cmd_sysctl_service("nginx", "restart")
 
     except Exception as e:
-        Logger.print_error(e)
-        Logger.print_dialog(
-            DialogType.ERROR,
-            center_content=True,
-            content=[f"{client.display_name} installation failed!"],
-        )
+        Logger.print_error(f"{client.display_name} installation failed!\n{e}")
         return
 
-    # noinspection HttpUrlsUsage
-    Logger.print_dialog(
-        DialogType.CUSTOM,
-        custom_title=f"{client.display_name} installation complete!",
-        custom_color=DialogCustomColor.GREEN,
-        center_content=True,
-        content=[
-            f"Open {client.display_name} now on: http://{get_ipv4_addr()}:{port}",
-        ],
-    )
+    log = f"Open {client.display_name} now on: http://{get_ipv4_addr()}:{port}"
+    Logger.print_ok(f"{client.display_name} installation complete!", start="\n")
+    Logger.print_ok(log, prefix=False, end="\n\n")
 
 
 def download_client(client: BaseWebClient) -> None:

kiauh/components/webui_client/client_utils.py

@@ -21,7 +21,6 @@ from components.webui_client.base_data import (
     BaseWebClient,
     WebClientType,
 )
-from components.webui_client.client_dialogs import print_client_port_select_dialog
 from components.webui_client.fluidd_data import FluiddData
 from components.webui_client.mainsail_data import MainsailData
 from core.backup_manager.backup_manager import BackupManager
@@ -34,7 +33,7 @@ from core.constants import (
     RESET_FORMAT,
 )
 from core.logger import Logger
-from core.settings.kiauh_settings import KiauhSettings, WebUiSettings
+from core.settings.kiauh_settings import KiauhSettings
 from core.submodules.simple_config_parser.src.simple_config_parser.simple_config_parser import (
     SimpleConfigParser,
 )
@@ -45,7 +44,6 @@ from utils.git_utils import (
     get_latest_remote_tag,
     get_latest_unstable_tag,
 )
-from utils.input_utils import get_number_input
 from utils.instance_utils import get_instances
 
 
@@ -370,36 +368,8 @@ def read_ports_from_nginx_configs() -> List[int]:
     return sorted(ports_to_ints_list, key=lambda x: int(x))
 
 
-def get_client_port_selection(
-    client: BaseWebClient,
-    settings: KiauhSettings,
-    reconfigure=False,
-) -> int:
-    default_port: int = int(settings.get(client.name, "port"))
-    ports_in_use: List[int] = read_ports_from_nginx_configs()
-    next_free_port: int = get_next_free_port(ports_in_use)
-
-    port: int = (
-        next_free_port
-        if not reconfigure and default_port in ports_in_use
-        else default_port
-    )
-
-    print_client_port_select_dialog(client.display_name, port, ports_in_use)
-
-    while True:
-        _type = "Reconfigure" if reconfigure else "Configure"
-        question = f"{_type} {client.display_name} for port"
-        port_input = get_number_input(question, min_count=80, default=port)
-
-        if port_input not in ports_in_use:
-            client_settings: WebUiSettings = settings[client.name]
-            client_settings.port = port_input
-            settings.save()
-
-            return port_input
-
-        Logger.print_error("This port is already in use. Please select another one.")
+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:
@@ -407,23 +377,3 @@ def get_next_free_port(ports_in_use: List[int]) -> int:
     used_ports = set(map(int, ports_in_use))
 
     return min(valid_ports - used_ports)
-
-
-def set_listen_port(client: BaseWebClient, curr_port: int, new_port: int) -> None:
-    """
-    Set the port the client should listen on in the NGINX config
-    :param curr_port: The current port the client listens on
-    :param new_port: The new port to set
-    :param client: The client to set the port for
-    :return: None
-    """
-    config = NGINX_SITES_AVAILABLE.joinpath(client.name)
-    with open(config, "r") as f:
-        lines = f.readlines()
-
-    for i, line in enumerate(lines):
-        if "listen" in line:
-            lines[i] = line.replace(str(curr_port), str(new_port))
-
-    with open(config, "w") as f:
-        f.writelines(lines)

kiauh/components/webui_client/menus/client_install_menu.py

@@ -1,104 +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 textwrap
-from typing import Type
-
-from components.webui_client.base_data import BaseWebClient
-from components.webui_client.client_setup import install_client
-from components.webui_client.client_utils import (
-    get_client_port_selection,
-    set_listen_port,
-)
-from core.constants import COLOR_CYAN, COLOR_GREEN, RESET_FORMAT
-from core.logger import DialogCustomColor, DialogType, Logger
-from core.menus import Option
-from core.menus.base_menu import BaseMenu
-from core.settings.kiauh_settings import KiauhSettings, WebUiSettings
-from utils.sys_utils import cmd_sysctl_service, get_ipv4_addr
-
-
-# noinspection PyUnusedLocal
-class ClientInstallMenu(BaseMenu):
-    def __init__(
-        self, client: BaseWebClient, previous_menu: Type[BaseMenu] | None = None
-    ):
-        super().__init__()
-        self.previous_menu: Type[BaseMenu] | None = previous_menu
-        self.client: BaseWebClient = client
-        self.settings = KiauhSettings()
-        self.client_settings: WebUiSettings = self.settings[client.name]
-
-    def set_previous_menu(self, previous_menu: Type[BaseMenu] | None) -> None:
-        from core.menus.install_menu import InstallMenu
-
-        self.previous_menu = previous_menu if previous_menu is not None else InstallMenu
-
-    def set_options(self) -> None:
-        self.options = {
-            "1": Option(method=self.reinstall_client),
-            "2": Option(method=self.change_listen_port),
-        }
-
-    def print_menu(self) -> None:
-        client_name = self.client.display_name
-
-        header = f" [ Installation Menu > {client_name} ] "
-        color = COLOR_GREEN
-        count = 62 - len(color) - len(RESET_FORMAT)
-        port = f"(Current: {COLOR_CYAN}{int(self.client_settings.port)}{RESET_FORMAT})"
-        menu = textwrap.dedent(
-            f"""
-            ╔═══════════════════════════════════════════════════════╗
-            ║ {color}{header:~^{count}}{RESET_FORMAT} ║
-            ╟───────────────────────────────────────────────────────╢
-            ║  1) Reinstall {client_name:16}                        ║
-            ║  2) Reconfigure Listen Port {port:<34} ║
-            ╟───────────────────────────────────────────────────────╢
-            """
-        )[1:]
-        print(menu, end="")
-
-    def reinstall_client(self, **kwargs) -> None:
-        install_client(self.client, settings=self.settings, reinstall=True)
-
-    def change_listen_port(self, **kwargs) -> None:
-        curr_port = int(self.client_settings.port)
-        new_port = get_client_port_selection(
-            self.client,
-            self.settings,
-            reconfigure=True,
-        )
-
-        cmd_sysctl_service("nginx", "stop")
-        set_listen_port(self.client, curr_port, new_port)
-
-        Logger.print_status("Saving new port configuration ...")
-        self.client_settings.port = new_port
-        self.settings.save()
-        Logger.print_ok("Port configuration saved!")
-
-        cmd_sysctl_service("nginx", "start")
-
-        # noinspection HttpUrlsUsage
-        Logger.print_dialog(
-            DialogType.CUSTOM,
-            custom_title="Port reconfiguration complete!",
-            custom_color=DialogCustomColor.GREEN,
-            center_content=True,
-            content=[
-                f"Open {self.client.display_name} now on: "
-                f"http://{get_ipv4_addr()}:{new_port}",
-            ],
-        )
-
-    def _go_back(self, **kwargs) -> None:
-        if self.previous_menu is not None:
-            self.previous_menu().run()

kiauh/core/menus/base_menu.py

@@ -29,7 +29,7 @@ from utils.input_utils import get_selection_input
 
 
 def clear() -> None:
-    subprocess.call("clear -x", shell=True)
+    subprocess.call("clear", shell=True)
 
 
 def print_header() -> None:

kiauh/core/menus/install_menu.py

@@ -15,17 +15,13 @@ from components.crowsnest.crowsnest import install_crowsnest
 from components.klipper import klipper_setup
 from components.klipperscreen.klipperscreen import install_klipperscreen
 from components.moonraker import moonraker_setup
-from components.webui_client.client_config.client_config_setup import (
-    install_client_config,
-)
-from components.webui_client.client_setup import install_client
+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 components.webui_client.menus.client_install_menu import ClientInstallMenu
 from core.constants import COLOR_GREEN, RESET_FORMAT
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
-from core.settings.kiauh_settings import KiauhSettings
 
 
 # noinspection PyUnusedLocal
@@ -84,24 +80,16 @@ class InstallMenu(BaseMenu):
         moonraker_setup.install_moonraker()
 
     def install_mainsail(self, **kwargs) -> None:
-        client: MainsailData = MainsailData()
-        if client.client_dir.exists():
-            ClientInstallMenu(client, self.__class__).run()
-        else:
-            install_client(client, settings=KiauhSettings())
+        client_setup.install_client(MainsailData())
 
     def install_mainsail_config(self, **kwargs) -> None:
-        install_client_config(MainsailData())
+        client_config_setup.install_client_config(MainsailData())
 
     def install_fluidd(self, **kwargs) -> None:
-        client: FluiddData = FluiddData()
-        if client.client_dir.exists():
-            ClientInstallMenu(client, self.__class__).run()
-        else:
-            install_client(client, settings=KiauhSettings())
+        client_setup.install_client(FluiddData())
 
     def install_fluidd_config(self, **kwargs) -> None:
-        install_client_config(FluiddData())
+        client_config_setup.install_client_config(FluiddData())
 
     def install_klipperscreen(self, **kwargs) -> None:
         install_klipperscreen()

kiauh/core/menus/settings_menu.py

@@ -11,8 +11,6 @@ from __future__ import annotations
 import textwrap
 from typing import Literal, Tuple, Type
 
-from components.klipper.klipper_utils import get_klipper_status
-from components.moonraker.moonraker_utils import get_moonraker_status
 from core.constants import COLOR_CYAN, COLOR_GREEN, RESET_FORMAT
 from core.logger import DialogType, Logger
 from core.menus import Option
@@ -28,8 +26,8 @@ class SettingsMenu(BaseMenu):
     def __init__(self, previous_menu: Type[BaseMenu] | None = None) -> None:
         super().__init__()
         self.previous_menu: Type[BaseMenu] | None = previous_menu
-        self.klipper_status = get_klipper_status()
-        self.moonraker_status = get_moonraker_status()
+        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
@@ -51,41 +49,31 @@ class SettingsMenu(BaseMenu):
 
     def print_menu(self) -> None:
         header = " [ KIAUH Settings ] "
-        color, rst = COLOR_CYAN, RESET_FORMAT
-        count = 62 - len(color) - len(rst)
-        checked = f"[{COLOR_GREEN}x{rst}]"
+        color = COLOR_CYAN
+        count = 62 - len(color) - len(RESET_FORMAT)
+        checked = f"[{COLOR_GREEN}x{RESET_FORMAT}]"
         unchecked = "[ ]"
-
-        kl_repo: str = f"{color}{self.klipper_status.repo}{rst}"
-        kl_branch: str = f"{color}{self.klipper_status.branch}{rst}"
-        kl_owner: str = f"{color}{self.klipper_status.owner}{rst}"
-        mr_repo: str = f"{color}{self.moonraker_status.repo}{rst}"
-        mr_branch: str = f"{color}{self.moonraker_status.branch}{rst}"
-        mr_owner: str = f"{color}{self.moonraker_status.owner}{rst}"
         o1 = checked if self.mainsail_unstable else unchecked
         o2 = checked if self.fluidd_unstable else unchecked
         o3 = checked if self.auto_backups_enabled else unchecked
         menu = textwrap.dedent(
             f"""
             ╔═══════════════════════════════════════════════════════╗
-            ║ {color}{header:~^{count}}{rst} ║
+            ║ {color}{header:~^{count}}{RESET_FORMAT} ║
             ╟───────────────────────────────────────────────────────╢
-            ║ Klipper:                                              ║
-            ║  ● Repo:   {kl_repo:51} ║
-            ║  ● Owner:  {kl_owner:51} ║
-            ║  ● Branch: {kl_branch:51} ║
-            ╟───────────────────────────────────────────────────────╢
-            ║ Moonraker:                                            ║
-            ║  ● Repo:   {mr_repo:51} ║
-            ║  ● Owner:  {mr_owner:51} ║
-            ║  ● Branch: {mr_branch:51} ║
-            ╟───────────────────────────────────────────────────────╢
-            ║ Install unstable releases:                            ║
+            ║ Klipper source repository:                            ║
+            ║   ● {self.klipper_repo:<67} ║
+            ║                                                       ║
+            ║ Moonraker source repository:                          ║
+            ║   ● {self.moonraker_repo:<67} ║
+            ║                                                       ║
+            ║ Install unstable Webinterface releases:               ║
             ║  {o1} Mainsail                                         ║
             ║  {o2} Fluidd                                           ║
-            ╟───────────────────────────────────────────────────────╢
+            ║                                                       ║
             ║ Auto-Backup:                                          ║
             ║  {o3} Automatic backup before update                   ║
+            ║                                                       ║
             ╟───────────────────────────────────────────────────────╢
             ║ 1) Set Klipper source repository                      ║
             ║ 2) Set Moonraker source repository                    ║
@@ -101,10 +89,25 @@ class SettingsMenu(BaseMenu):
 
     def _load_settings(self) -> None:
         self.settings = KiauhSettings()
+
+        self._format_repo_str("klipper")
+        self._format_repo_str("moonraker")
+
         self.auto_backups_enabled = self.settings.kiauh.backup_before_update
         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 _gather_input(self) -> Tuple[str, str]:
         Logger.print_dialog(
             DialogType.ATTENTION,

kiauh/core/types.py

@@ -25,7 +25,6 @@ class ComponentStatus:
     status: StatusCode
     owner: str | None = None
     repo: str | None = None
-    branch: str = ""
     local: str | None = None
     remote: str | None = None
     instances: int | None = None

kiauh/utils/common.py

@@ -24,7 +24,6 @@ from core.constants import (
 from core.logger import DialogType, Logger
 from core.types import ComponentStatus, StatusCode
 from utils.git_utils import (
-    get_current_branch,
     get_local_commit,
     get_local_tags,
     get_remote_commit,
@@ -104,12 +103,7 @@ def get_install_status(
     """
     from utils.instance_utils import get_instances
 
-    checks = []
-    branch: str = ""
-
-    if repo_dir.exists():
-        checks.append(True)
-        branch = get_current_branch(repo_dir)
+    checks = [repo_dir.exists()]
 
     if env_dir is not None:
         checks.append(env_dir.exists())
@@ -137,7 +131,6 @@ def get_install_status(
         instances=instances,
         owner=org,
         repo=repo,
-        branch=branch,
         local=get_local_commit(repo_dir),
         remote=get_remote_commit(repo_dir),
     )

kiauh/utils/config_utils.py

@@ -8,7 +8,6 @@
 # ======================================================================= #
 from __future__ import annotations
 
-import shutil
 import tempfile
 from pathlib import Path
 from typing import List, Tuple
@@ -27,9 +26,6 @@ def add_config_section(
     instances: List[InstanceType],
     options: List[ConfigOption] | None = None,
 ) -> None:
-    if not instances:
-        return
-
     for instance in instances:
         cfg_file = instance.cfg_file
         Logger.print_status(f"Add section '[{section}]' to '{cfg_file}' ...")
@@ -73,7 +69,7 @@ def add_config_section_at_top(section: str, instances: List[InstanceType]) -> No
             tmp.writelines(org_content)
 
         cfg_file.unlink()
-        shutil.move(tmp_cfg_path, cfg_file)
+        tmp_cfg_path.rename(cfg_file)
 
         Logger.print_ok("OK!")
 

kiauh/utils/git_utils.py

@@ -87,29 +87,12 @@ def get_repo_name(repo: Path) -> Tuple[str, str]:
         orga: str = substrings[0] if substrings[0] else "-"
         name: str = substrings[1] if substrings[1] else "-"
 
-        return orga, name.replace(".git", "")
+        return orga, name
 
     except CalledProcessError:
         return "-", "-"
 
 
-def get_current_branch(repo: Path) -> str:
-    """
-    Get the current branch of a local Git repository
-    :param repo: Path to the local Git repository
-    :return: Current branch
-    """
-    try:
-        cmd = ["git", "branch", "--show-current"]
-        result: str = check_output(cmd, stderr=DEVNULL, cwd=repo).decode(
-            encoding="utf-8"
-        )
-        return result.strip()
-
-    except CalledProcessError:
-        return ""
-
-
 def get_local_tags(repo_path: Path, _filter: str | None = None) -> List[str]:
     """
     Get all tags of a local Git repository
@@ -226,8 +209,8 @@ def get_local_commit(repo: Path) -> str | None:
         return None
 
     try:
-        cmd = "git describe HEAD --always --tags | cut -d '-' -f 1,2"
-        return check_output(cmd, shell=True, text=True, cwd=repo).strip()
+        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
 
@@ -237,15 +220,12 @@ def get_remote_commit(repo: Path) -> str | None:
         return None
 
     try:
-        branch = get_current_branch(repo)
-        cmd = f"git describe 'origin/{branch}' --always --tags | cut -d '-' -f 1,2"
-        return check_output(
-            cmd,
-            shell=True,
-            text=True,
-            cwd=repo,
-            stderr=DEVNULL,
-        ).strip()
+        # get locally checked out branch
+        branch_cmd = f"cd {repo} && git branch | grep -E '\*'"
+        branch = check_output(branch_cmd, shell=True, text=True)
+        branch = branch.split("*")[-1].strip()
+        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
 

scripts/klipper.sh

@@ -264,7 +264,7 @@ function clone_klipper() {
   status_msg "Cloning Klipper from ${repo} ..."
 
   cd "${HOME}" || exit 1
-  if git clone "${repo}" "${KLIPPER_DIR}"; then
+  if git clone "${repo}" "${KLIPPER_DIR}" --depth 1; then
     cd "${KLIPPER_DIR}" && git checkout "${branch}"
   else
     print_error "Cloning Klipper from\n ${repo}\n failed!"

scripts/spoolman.sh

@@ -127,9 +127,9 @@ managed_services: Spoolman
   regex="${HOME//\//\\/}\/([A-Za-z0-9_]+)\/moonraker\.asvc"
   moonraker_asvc=$(find "${HOME}" -maxdepth 2 -type f -regextype posix-extended -regex "${regex}" | sort)
 
-  if ! grep -q "^Spoolman$" "${moonraker_asvc}"; then
+  if [[ -n ${moonraker_asvc} ]]; then
     status_msg "Adding Spoolman service to moonraker.asvc..."
-    sed -i '$a''Spoolman' "${moonraker_asvc}"
+    /bin/sh -c "echo 'Spoolman' >> ${moonraker_asvc}"
   fi
 }
 
@@ -248,7 +248,7 @@ function get_spoolman_status() {
 
 function get_local_spoolman_version() {
   [[ ! -d "${SPOOLMAN_DIR}" ]] && return
-
+  
   local version
   version=$(grep -o '"version":\s*"[^"]*' "${SPOOLMAN_DIR}"/release_info.json | cut -d'"' -f4)
   echo "${version}"