Release v6.0.0-alpha.13

Merge develop into master (Release v6.0.0-alpha.13)

kiauh/components/webui_client/client_setup.py

@@ -37,7 +37,6 @@ from components.webui_client.client_utils import (
 )
 from core.instance_manager.instance_manager import InstanceManager
 from core.logger import DialogType, Logger
-from core.services.message_service import Message
 from core.settings.kiauh_settings import KiauhSettings
 from core.types.color import Color
 from utils.common import backup_printer_config_dir, check_install_dependencies
@@ -56,21 +55,14 @@ def install_client(
     client: BaseWebClient,
     settings: KiauhSettings,
     reinstall: bool = False,
-    ) -> Message:
+) -> None:
-    completion_msg = Message(
-        title=f"{client.display_name} Installation Process completed",
-        color=Color.GREEN,
-        )
     mr_instances: List[Moonraker] = get_instances(Moonraker)
 
     enable_remotemode = False
     if not mr_instances:
         print_moonraker_not_found_dialog(client.display_name)
         if not get_confirm(f"Continue {client.display_name} installation?"):
-            completion_msg.color = Color.YELLOW
+            return
-            completion_msg.title = f"{client.display_name} Installation Process aborted"
-            completion_msg.text.append("Installation was aborted by the user!")
-            return completion_msg
 
     # if moonraker is not installed or multiple instances
     # are installed we enable mainsails remote mode
@@ -98,9 +90,9 @@ def install_client(
         default_port if reinstall else get_client_port_selection(client, settings)
     )
 
-    try:
+    check_install_dependencies({"nginx"})
-        check_install_dependencies({"nginx"})
 
+    try:
         download_client(client)
         if enable_remotemode and client.client == WebClientType.MAINSAIL:
             enable_mainsail_remotemode()
@@ -138,17 +130,23 @@ def install_client(
 
     except Exception as e:
         Logger.print_error(e)
-        completion_msg.color = Color.RED
+        Logger.print_dialog(
-        completion_msg.title = f"{client.display_name} Installation Process failed!"
+            DialogType.ERROR,
-        completion_msg.text.append(
+            center_content=True,
-            f"An unexpected error occured. Please see the output above. {client.display_name} installation failed!")
+            content=[f"{client.display_name} installation failed!"],
-        return completion_msg
+        )
+        return
 
     # noinspection HttpUrlsUsage
-    completion_msg.text.append(
+    Logger.print_dialog(
-        f"Open {client.display_name} now on: http://{get_ipv4_addr()}:{port}")
+        DialogType.CUSTOM,
-
+        custom_title=f"{client.display_name} installation complete!",
-    return completion_msg
+        custom_color=Color.GREEN,
+        center_content=True,
+        content=[
+            f"Open {client.display_name} now on: http://{get_ipv4_addr()}:{port}",
+        ],
+    )
 
 
 def download_client(client: BaseWebClient) -> None:

kiauh/components/webui_client/menus/client_install_menu.py

@@ -65,8 +65,7 @@ class ClientInstallMenu(BaseMenu):
         print(menu, end="")
 
     def reinstall_client(self, **kwargs) -> None:
-        completion_msg = install_client(self.client, settings=self.settings, reinstall=True)
+        install_client(self.client, settings=self.settings, reinstall=True)
-        self.message_service.set_message(completion_msg)
 
     def change_listen_port(self, **kwargs) -> None:
         curr_port = self._get_current_port()

kiauh/core/menus/install_menu.py

@@ -81,13 +81,21 @@ class InstallMenu(BaseMenu):
         moonraker_setup.install_moonraker()
 
     def install_mainsail(self, **kwargs) -> None:
-        self._install_client(MainsailData())
+        client: MainsailData = MainsailData()
+        if client.client_dir.exists():
+            ClientInstallMenu(client, self.__class__).run()
+        else:
+            install_client(client, settings=KiauhSettings())
 
     def install_mainsail_config(self, **kwargs) -> None:
         install_client_config(MainsailData())
 
     def install_fluidd(self, **kwargs) -> None:
-        self._install_client(FluiddData())
+        client: FluiddData = FluiddData()
+        if client.client_dir.exists():
+            ClientInstallMenu(client, self.__class__).run()
+        else:
+            install_client(client, settings=KiauhSettings())
 
     def install_fluidd_config(self, **kwargs) -> None:
         install_client_config(FluiddData())
@@ -97,10 +105,3 @@ class InstallMenu(BaseMenu):
 
     def install_crowsnest(self, **kwargs) -> None:
         install_crowsnest()
-
-    def _install_client(self, client: MainsailData | FluiddData) -> None:
-        if client.client_dir.exists():
-            ClientInstallMenu(client, self.__class__).run()
-        else:
-            completion_msg = install_client(client, settings=KiauhSettings())
-            self.message_service.set_message(completion_msg)

kiauh/core/menus/settings_menu.py

@@ -21,9 +21,7 @@ from core.menus import Option
 from core.menus.base_menu import BaseMenu
 from core.settings.kiauh_settings import KiauhSettings, RepoSettings
 from core.types.color import Color
-from core.types.component_status import ComponentStatus
 from procedures.switch_repo import run_switch_repo_routine
-from utils.git_utils import get_repo_name
 from utils.input_utils import get_confirm, get_string_input
 
 
@@ -141,12 +139,12 @@ class SettingsMenu(BaseMenu):
 
         repo = get_string_input(
             "Enter new repository URL",
-            regex="^[\w/.:-]+$",
+            regex=r"^[\w/.:-]+$",
             default=KLIPPER_REPO_URL if repo_name == "klipper" else MOONRAKER_REPO_URL,
         )
         branch = get_string_input(
             "Enter new branch name",
-            regex="^.+$",
+            regex=r"^.+$",
             default="master"
         )
 

kiauh/procedures/system.py

@@ -51,7 +51,7 @@ def change_system_hostname() -> None:
     )
     hostname = get_string_input(
         "Enter the new hostname",
-        regex="^[a-z0-9]+([a-z0-9-]*[a-z0-9])?$",
+        regex=r"^[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 ...")