Merge 8a048e689e into e421a12daf

kiauh/components/crowsnest/crowsnest.py

@@ -88,6 +88,7 @@ def print_multi_instance_warning(instances: List[Klipper]) -> None:
             "The following instances were found:",
             *_instances,
         ],
+        end="",
     )
 
 

kiauh/components/klipper/klipper_setup.py

@@ -145,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?"):

kiauh/components/klipper/klipper_utils.py

@@ -220,6 +220,7 @@ def check_user_groups():
             "INFO:",
             "Relog required for group assignments to take effect!",
         ],
+        end="",
     )
 
     if not get_confirm(f"Add user '{CURRENT_USER}' to group(s) now?"):
@@ -271,7 +272,7 @@ def handle_disruptive_system_packages() -> None:
                     "Please fix the problem manually. Otherwise, this may have "
                     "undesirable effects on the operation of Klipper."
                 ],
-                padding_bottom="",
+                end="",
             )
 
 

kiauh/components/klipper_firmware/menus/klipper_flash_menu.py

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

kiauh/components/klipperscreen/klipperscreen.py

@@ -62,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?",

kiauh/components/mobileraker/mobileraker.py

@@ -58,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?",

kiauh/components/octoeverywhere/octoeverywhere.py

@@ -62,17 +62,11 @@ class Octoeverywhere(BaseInstance):
             raise
 
     def delete(self) -> None:
-        service_file = self.get_service_file_name(extension=True)
+        Logger.print_status("Removing OctoEverywhere for Klipper Instance ...")
-        service_file_path = self.get_service_file_path()
-
-        Logger.print_status(
-            f"Deleting OctoEverywhere for Klipper Instance: {service_file}"
-        )
 
         try:
-            command = ["sudo", "rm", "-f", service_file_path]
+            cmd = f"OE_REMOVE_SCRIPT {self.cfg_dir}/moonraker.conf"
-            run(command, check=True)
+            run(cmd, check=True, shell=True)
-            Logger.print_ok(f"Service file deleted: {service_file_path}")
         except CalledProcessError as e:
-            Logger.print_error(f"Error deleting service file: {e}")
+            Logger.print_error(f"Error deleting instance: {e}")
             raise

kiauh/components/octoeverywhere/octoeverywhere_setup.py

@@ -7,7 +7,7 @@
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
 import json
-from pathlib import Path
+import shutil
 from typing import List
 
 from components.moonraker.moonraker import Moonraker
@@ -28,7 +28,7 @@ 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
 from utils.logger import DialogType, Logger
@@ -47,6 +47,8 @@ def install_octoeverywhere() -> None:
     if not moonraker_exists():
         return
 
+    # if obico is already installed, ask if the user wants to repair an
+    # incomplete installation or link to the obico server
     oe_im = InstanceManager(Octoeverywhere)
     oe_instances: List[Octoeverywhere] = oe_im.instances
     if oe_instances:
@@ -57,6 +59,7 @@ def install_octoeverywhere() -> None:
                 "It is save to run the installer again to link your "
                 "printer or repair any issues.",
             ],
+            end="",
         )
         if not get_confirm("Re-run OctoEverywhere installation?"):
             Logger.print_info("Exiting OctoEverywhere for Klipper installation ...")
@@ -77,6 +80,7 @@ def install_octoeverywhere() -> None:
                 "\n\n",
                 "The setup will apply the same names to OctoEverywhere!",
             ],
+            end="",
         )
 
     if not get_confirm(
@@ -94,7 +98,14 @@ def install_octoeverywhere() -> None:
         for moonraker in mr_instances:
             oe_im.current_instance = Octoeverywhere(suffix=moonraker.suffix)
             oe_im.create_instance()
+            oe_im.enable_instance()
+            oe_im.start_instance()
 
+        cmd_sysctl_manage("daemon-reload")
+
+        # TODO: probably done by OE already?
+        # add to moonraker update manager
+        patch_moonraker_conf(mr_instances)
         mr_im.restart_all_instance()
 
         Logger.print_dialog(
@@ -189,40 +200,36 @@ def remove_oe_instances(
 
 
 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)
+    try:
+        shutil.rmtree(OE_DIR)
+    except OSError as e:
+        Logger.print_error(f"Unable to delete '{OE_DIR}':\n{e}")
 
 
 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)
+    try:
+        shutil.rmtree(OE_ENV_DIR)
+    except OSError as e:
+        Logger.print_error(f"Unable to delete '{OE_ENV_DIR}':\n{e}")
 
 
 def delete_oe_logs(instances: List[Octoeverywhere]) -> None:
     Logger.print_status("Removing OctoEverywhere logs ...")
-
     all_logfiles = []
     for instance in instances:
         all_logfiles = list(instance.log_dir.glob(f"{OE_LOG_NAME}*"))
-
-    install_log = Path.home().joinpath("octoeverywhere-installer.log")
-    if install_log.exists():
-        all_logfiles.append(install_log)
-
     if not all_logfiles:
         Logger.print_info("No OctoEverywhere logs found. Skipped ...")
         return
 
     for log in all_logfiles:
         Logger.print_status(f"Remove '{log}'")
-        run_remove_routines(log)
+        remove_file(log)

kiauh/components/webui_client/client_dialogs.py

@@ -13,7 +13,6 @@ from typing import List
 from components.webui_client.base_data import BaseWebClient
 from core.menus.base_menu import print_back_footer
 from utils.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
-from utils.logger import DialogType, Logger
 
 
 def print_moonraker_not_found_dialog():
@@ -85,33 +84,25 @@ def print_client_port_select_dialog(name: str, port: int, ports_in_use: List[int
     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(
+    line1 = f"have {name} fully functional and working."
-        DialogType.INFO,
+    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 have {name} fully "
+        f"""
-            f"functional and working.",
+        /=======================================================\\
-            "\n\n",
+        | It is recommended to use special macros in order to   |
-            f"The recommended macros for {name} can be seen here:",
+        | {line1:<54}|
-            url,
+        |                                                       |
-            "\n\n",
+        | {line2:<54}|
-            "If you already use these macros skip this step. Otherwise you should "
+        | {url:<54}|
-            "consider to answer with 'Y' to download the recommended macros.",
+        |                                                       |
-        ],
+        | If you already use these macros skip this step.       |
-    )
+        | Otherwise you should consider to answer with 'Y' to   |
+        | download the recommended macros.                      |
+        \\=======================================================/
+        """
+    )[1:]
 
-
+    print(dialog, end="")
-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.",
-        ],
-    )

kiauh/components/webui_client/client_setup.py

@@ -24,7 +24,6 @@ from components.webui_client.client_config.client_config_setup import (
 from components.webui_client.client_dialogs import (
     print_client_port_select_dialog,
     print_install_client_config_dialog,
-    print_ipv6_warning_dialog,
     print_moonraker_not_found_dialog,
 )
 from components.webui_client.client_utils import (
@@ -50,7 +49,6 @@ from utils.fs_utils import (
 from utils.input_utils import get_confirm, get_number_input
 from utils.logger import Logger
 from utils.sys_utils import (
-    check_ipv6,
     cmd_sysctl_service,
     download_file,
     get_ipv4_addr,
@@ -117,13 +115,6 @@ def install_client(client: BaseWebClient) -> None:
         )
         valid_port = is_valid_port(port, ports_in_use)
 
-    # check if ipv6 is enabled, as this may cause issues with nginx
-    if check_ipv6():
-        print_ipv6_warning_dialog()
-        if not get_confirm(f"Continue with {client.display_name} installation?"):
-            Logger.print_info(f"Exiting {client.display_name} installation ...")
-            return
-
     check_install_dependencies(["nginx", "unzip"])
 
     try:

kiauh/core/menus/settings_menu.py

@@ -144,6 +144,7 @@ class SettingsMenu(BaseMenu):
                 f"New {display_name} repository branch:",
                 f"● {branch}",
             ],
+            end="",
         )
 
         if get_confirm("Apply changes?", allow_go_back=True):

kiauh/core/settings/kiauh_settings.py

@@ -219,5 +219,6 @@ class KiauhSettings:
                 "● default.kiauh.cfg",
                 "● kiauh.cfg",
             ],
+            end="",
         )
         kill()

kiauh/extensions/obico/moonraker_obico_extension.py

@@ -192,6 +192,7 @@ class ObicoExtension(BaseExtension):
                 "http://server_ip:port",
                 "For instance, 'http://192.168.0.5:3334'.",
             ],
+            end="",
         )
 
     def _print_moonraker_instances(self, mr_instances) -> None:
@@ -205,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:
@@ -219,6 +221,7 @@ class ObicoExtension(BaseExtension):
                 "L) Link printer to the Obico server",
                 "R) Repair installation",
             ],
+            end="",
         )
 
     def _get_server_url(self) -> None:
@@ -321,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 ...")

kiauh/utils/common.py

@@ -150,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/fs_utils.py

@@ -59,9 +59,9 @@ 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]
+        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}")
@@ -79,30 +79,6 @@ def remove_file(file_path: Path, sudo=False) -> None:
         raise
 
 
-def run_remove_routines(file: Path) -> None:
-    try:
-        if 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():
-            file.unlink()
-        else:
-            raise OSError(f"File '{file}' is neither a file nor a directory!")
-        Logger.print_ok("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("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 |

kiauh/utils/logger.py

@@ -90,8 +90,7 @@ class Logger:
         center_content: bool = False,
         custom_title: str = None,
         custom_color: DialogCustomColor = None,
-        padding_top: int = 1,
+        end: str = "\n",
-        padding_bottom: int = 1,
     ) -> None:
         dialog_color = Logger._get_dialog_color(title, custom_color)
         dialog_title = Logger._get_dialog_title(title, custom_title)
@@ -100,12 +99,10 @@ class Logger:
         top = Logger._format_top_border(dialog_color)
         bottom = Logger._format_bottom_border()
 
-        print("\n" * padding_top)
         print(
             f"{top}{dialog_title_formatted}{dialog_content}{bottom}",
-            end="",
+            end=end,
         )
-        print("\n" * padding_bottom)
 
     @staticmethod
     def _get_dialog_title(title: DialogType, custom_title: str = None) -> str:
@@ -123,12 +120,18 @@ class Logger:
 
     @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 (
+        return textwrap.dedent(
-            f"\n┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛{RESET_FORMAT}"
+            f"""
+            ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+            {RESET_FORMAT}"""
         )
 
     @staticmethod

kiauh/utils/sys_utils.py

@@ -402,34 +402,3 @@ def log_process(process: Popen) -> None:
 
         if process.poll() is not None:
             break
-
-
-def check_ipv6() -> bool:
-    """
-    Check if IPv6 is enabled
-    :return: True if IPv6 is enabled, False otherwise
-    """
-    try:
-        file1 = Path("/proc/sys/net/ipv6/conf/all/disable_ipv6")
-        if file1.exists():
-            with open(file1, "r") as file:
-                if file.read().strip() == "0":
-                    return True
-                elif file.read().strip() == "1":
-                    return False
-
-        file3 = Path("/etc/sysctl.conf")
-        if file3.exists():
-            with open(file3, "r") as file:
-                for line in file.readlines():
-                    if (
-                        "net.ipv6.conf.all.disable_ipv6" in line
-                        and not line.startswith("#")
-                        and line.split("=")[1].strip() == "0"
-                    ):
-                        return True
-        return False
-
-    except Exception as e:
-        Logger.print_error(f"Error checking IPv6: {e}")
-        return True