Merge a4b149c11a into a374ac8fac

.gitignore

@@ -1,7 +1,7 @@
 .idea
 .vscode
+.idea
 .pytest_cache
-__pycache__
 .kiauh-env
 *.code-workspace
 *.iml

kiauh/components/crowsnest/crowsnest.py

@@ -28,6 +28,7 @@ from utils.git_utils import (
     get_remote_commit,
     git_pull_wrapper,
 )
+from utils.input_utils import get_confirm
 from utils.logger import Logger
 from utils.sys_utils import (
     parse_packages_from_file,
@@ -47,37 +48,23 @@ def install_crowsnest() -> None:
     instances: List[Klipper] = im.find_instances()
 
     if len(instances) > 1:
-        configure_multi_instance(instances)
+        Logger.print_status("Multi instance install detected ...")
+        info = textwrap.dedent("""
+            Crowsnest is NOT designed to support multi instances.
+            A workaround for this is to choose the most used instance as a 'master'
+            Use this instance to set up your 'crowsnest.conf' and steering it's service.
+            Found the following instances:
+            """)[:-1]
+        print(info, end="")
+        for instance in instances:
+            print(f"● {instance.data_dir_name}")
 
-    # Step 4: Launch crowsnest installer
+        Logger.print_status("\nLaunching crowsnest's configuration tool ...")
-    print(f"{COLOR_CYAN}Installer will prompt you for sudo password!{RESET_FORMAT}")
+
-    Logger.print_status("Launching crowsnest installer ...")
+    if not get_confirm("Continue with configuration?", False, allow_go_back=True):
-    try:
+        Logger.print_info("Installation aborted by user ... Exiting!")
-        run(
-            f"sudo make install BASE_USER={CURRENT_USER}",
-            cwd=CROWSNEST_DIR,
-            shell=True,
-            check=True,
-        )
-    except CalledProcessError as e:
-        Logger.print_error(f"Something went wrong! Please try again...\n{e}")
         return
 
-
-def configure_multi_instance(instances: List[Klipper]) -> None:
-    Logger.print_status("Multi instance install detected ...")
-    info = textwrap.dedent("""
-        Crowsnest is NOT designed to support multi instances.
-        A workaround for this is to choose the most used instance as a 'master'
-        Use this instance to set up your 'crowsnest.conf' and steering it's service.
-        Found the following instances:
-        """)[:-1]
-    print(info, end="")
-    for instance in instances:
-        print(f"● {instance.data_dir_name}")
-
-    Logger.print_status("\nLaunching crowsnest's configuration tool ...")
-
     config = Path(CROWSNEST_DIR).joinpath("tools/.config")
     try:
         run(
@@ -96,6 +83,20 @@ def configure_multi_instance(instances: List[Klipper]) -> None:
         Logger.print_error("Generating .config failed, installation aborted")
         return
 
+    # Step 4: Launch crowsnest installer
+    print(f"{COLOR_CYAN}Installer will prompt you for sudo password!{RESET_FORMAT}")
+    Logger.print_status("Launching crowsnest installer ...")
+    try:
+        run(
+            f"sudo make install BASE_USER={CURRENT_USER}",
+            cwd=CROWSNEST_DIR,
+            shell=True,
+            check=True,
+        )
+    except CalledProcessError as e:
+        Logger.print_error(f"Something went wrong! Please try again...\n{e}")
+        return
+
 
 def update_crowsnest() -> None:
     try: