diff --git a/kiauh/core/menus/base_menu.py b/kiauh/core/menus/base_menu.py index 434293c..59b5d91 100644 --- a/kiauh/core/menus/base_menu.py +++ b/kiauh/core/menus/base_menu.py @@ -175,7 +175,7 @@ class BaseMenu(ABC): if isinstance(option, type) and issubclass(option, BaseMenu): self.navigate_to_submenu(option) elif callable(option): - option() + option(opt_index=choice) elif option is None: raise NotImplementedError(f"No implementation for option {choice}") else: diff --git a/kiauh/core/menus/install_menu.py b/kiauh/core/menus/install_menu.py index 22bdad2..83344ab 100644 --- a/kiauh/core/menus/install_menu.py +++ b/kiauh/core/menus/install_menu.py @@ -19,6 +19,7 @@ from kiauh.modules.moonraker import moonraker_setup from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT +# noinspection PyUnusedLocal # noinspection PyMethodMayBeStatic class InstallMenu(BaseMenu): def __init__(self): @@ -63,35 +64,35 @@ class InstallMenu(BaseMenu): )[1:] print(menu, end="") - def install_klipper(self): + def install_klipper(self, **kwargs): klipper_setup.install_klipper() - def install_moonraker(self): + def install_moonraker(self, **kwargs): moonraker_setup.install_moonraker() - def install_mainsail(self): + def install_mainsail(self, **kwargs): mainsail_setup.install_mainsail() - def install_fluidd(self): + def install_fluidd(self, **kwargs): print("install_fluidd") - def install_klipperscreen(self): + def install_klipperscreen(self, **kwargs): print("install_klipperscreen") - def install_pretty_gcode(self): + def install_pretty_gcode(self, **kwargs): print("install_pretty_gcode") - def install_telegram_bot(self): + def install_telegram_bot(self, **kwargs): print("install_telegram_bot") - def install_obico(self): + def install_obico(self, **kwargs): print("install_obico") - def install_octoeverywhere(self): + def install_octoeverywhere(self, **kwargs): print("install_octoeverywhere") - def install_mobileraker(self): + def install_mobileraker(self, **kwargs): print("install_mobileraker") - def install_crowsnest(self): + def install_crowsnest(self, **kwargs): print("install_crowsnest") diff --git a/kiauh/core/menus/remove_menu.py b/kiauh/core/menus/remove_menu.py index bb81c31..e8ddd79 100644 --- a/kiauh/core/menus/remove_menu.py +++ b/kiauh/core/menus/remove_menu.py @@ -19,6 +19,7 @@ from kiauh.modules.moonraker.menus.moonraker_remove_menu import MoonrakerRemoveM from kiauh.utils.constants import COLOR_RED, RESET_FORMAT +# noinspection PyUnusedLocal # noinspection PyMethodMayBeStatic class RemoveMenu(BaseMenu): def __init__(self): @@ -69,35 +70,35 @@ class RemoveMenu(BaseMenu): )[1:] print(menu, end="") - def remove_fluidd(self): + def remove_fluidd(self, **kwargs): print("remove_fluidd") - def remove_fluidd_config(self): + def remove_fluidd_config(self, **kwargs): print("remove_fluidd_config") - def remove_klipperscreen(self): + def remove_klipperscreen(self, **kwargs): print("remove_klipperscreen") - def remove_crowsnest(self): + def remove_crowsnest(self, **kwargs): print("remove_crowsnest") - def remove_mjpgstreamer(self): + def remove_mjpgstreamer(self, **kwargs): print("remove_mjpgstreamer") - def remove_pretty_gcode(self): + def remove_pretty_gcode(self, **kwargs): print("remove_pretty_gcode") - def remove_telegram_bot(self): + def remove_telegram_bot(self, **kwargs): print("remove_telegram_bot") - def remove_obico(self): + def remove_obico(self, **kwargs): print("remove_obico") - def remove_octoeverywhere(self): + def remove_octoeverywhere(self, **kwargs): print("remove_octoeverywhere") - def remove_mobileraker(self): + def remove_mobileraker(self, **kwargs): print("remove_mobileraker") - def remove_nginx(self): + def remove_nginx(self, **kwargs): print("remove_nginx") diff --git a/kiauh/core/menus/update_menu.py b/kiauh/core/menus/update_menu.py index f947d84..5b7c6ef 100644 --- a/kiauh/core/menus/update_menu.py +++ b/kiauh/core/menus/update_menu.py @@ -27,6 +27,7 @@ from kiauh.modules.moonraker.moonraker_utils import get_moonraker_status from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_WHITE +# noinspection PyUnusedLocal # noinspection PyMethodMayBeStatic class UpdateMenu(BaseMenu): def __init__(self): @@ -93,43 +94,43 @@ class UpdateMenu(BaseMenu): )[1:] print(menu, end="") - def update_all(self): + def update_all(self, **kwargs): print("update_all") - def update_klipper(self): + def update_klipper(self, **kwargs): update_klipper() - def update_moonraker(self): + def update_moonraker(self, **kwargs): update_moonraker() - def update_mainsail(self): + def update_mainsail(self, **kwargs): update_mainsail() - def update_fluidd(self): + def update_fluidd(self, **kwargs): print("update_fluidd") - def update_klipperscreen(self): + def update_klipperscreen(self, **kwargs): print("update_klipperscreen") - def update_pgc_for_klipper(self): + def update_pgc_for_klipper(self, **kwargs): print("update_pgc_for_klipper") - def update_telegram_bot(self): + def update_telegram_bot(self, **kwargs): print("update_telegram_bot") - def update_moonraker_obico(self): + def update_moonraker_obico(self, **kwargs): print("update_moonraker_obico") - def update_octoeverywhere(self): + def update_octoeverywhere(self, **kwargs): print("update_octoeverywhere") - def update_mobileraker(self): + def update_mobileraker(self, **kwargs): print("update_mobileraker") - def update_crowsnest(self): + def update_crowsnest(self, **kwargs): print("update_crowsnest") - def upgrade_system_packages(self): + def upgrade_system_packages(self, **kwargs): print("upgrade_system_packages") def fetch_update_status(self): diff --git a/kiauh/modules/klipper/menus/klipper_remove_menu.py b/kiauh/modules/klipper/menus/klipper_remove_menu.py index d5cd0d9..61fdc94 100644 --- a/kiauh/modules/klipper/menus/klipper_remove_menu.py +++ b/kiauh/modules/klipper/menus/klipper_remove_menu.py @@ -18,6 +18,7 @@ from kiauh.modules.moonraker import moonraker_remove from kiauh.utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN +# noinspection PyUnusedLocal class KlipperRemoveMenu(BaseMenu): def __init__(self): super().__init__( @@ -67,25 +68,25 @@ class KlipperRemoveMenu(BaseMenu): )[1:] print(menu, end="") - def toggle_all(self) -> None: + def toggle_all(self, **kwargs) -> None: 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) -> None: + def toggle_remove_klipper_service(self, **kwargs) -> None: self.remove_klipper_service = not self.remove_klipper_service - def toggle_remove_klipper_dir(self) -> None: + def toggle_remove_klipper_dir(self, **kwargs) -> None: self.remove_klipper_dir = not self.remove_klipper_dir - def toggle_remove_klipper_env(self) -> None: + def toggle_remove_klipper_env(self, **kwargs) -> None: self.remove_klipper_env = not self.remove_klipper_env - def toggle_delete_klipper_logs(self) -> None: + def toggle_delete_klipper_logs(self, **kwargs) -> None: self.delete_klipper_logs = not self.delete_klipper_logs - def run_removal_process(self) -> None: + def run_removal_process(self, **kwargs) -> None: if ( not self.remove_klipper_service and not self.remove_klipper_dir diff --git a/kiauh/modules/mainsail/menus/mainsail_remove_menu.py b/kiauh/modules/mainsail/menus/mainsail_remove_menu.py index bd0abef..e2ec352 100644 --- a/kiauh/modules/mainsail/menus/mainsail_remove_menu.py +++ b/kiauh/modules/mainsail/menus/mainsail_remove_menu.py @@ -17,6 +17,7 @@ from kiauh.modules.mainsail import mainsail_remove from kiauh.utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN +# noinspection PyUnusedLocal class MainsailRemoveMenu(BaseMenu): def __init__(self): super().__init__( @@ -72,29 +73,29 @@ class MainsailRemoveMenu(BaseMenu): )[1:] print(menu, end="") - def toggle_all(self) -> None: + def toggle_all(self, **kwargs) -> None: self.remove_mainsail = True self.remove_ms_config = True self.backup_config_json = True self.remove_updater_section = True self.remove_printer_cfg_include = True - def toggle_remove_mainsail(self) -> None: + def toggle_remove_mainsail(self, **kwargs) -> None: self.remove_mainsail = not self.remove_mainsail - def toggle_remove_ms_config(self) -> None: + def toggle_remove_ms_config(self, **kwargs) -> None: self.remove_ms_config = not self.remove_ms_config - def toggle_backup_config_json(self) -> None: + def toggle_backup_config_json(self, **kwargs) -> None: self.backup_config_json = not self.backup_config_json - def toggle_remove_updater_section(self) -> None: + def toggle_remove_updater_section(self, **kwargs) -> None: self.remove_updater_section = not self.remove_updater_section - def toggle_remove_printer_cfg_include(self) -> None: + def toggle_remove_printer_cfg_include(self, **kwargs) -> None: self.remove_printer_cfg_include = not self.remove_printer_cfg_include - def run_removal_process(self) -> None: + def run_removal_process(self, **kwargs) -> None: if ( not self.remove_mainsail and not self.remove_ms_config diff --git a/kiauh/modules/moonraker/menus/moonraker_remove_menu.py b/kiauh/modules/moonraker/menus/moonraker_remove_menu.py index 348b34d..c193f85 100644 --- a/kiauh/modules/moonraker/menus/moonraker_remove_menu.py +++ b/kiauh/modules/moonraker/menus/moonraker_remove_menu.py @@ -17,6 +17,7 @@ from kiauh.modules.moonraker import moonraker_remove from kiauh.utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN +# noinspection PyUnusedLocal class MoonrakerRemoveMenu(BaseMenu): def __init__(self): super().__init__( @@ -70,29 +71,29 @@ class MoonrakerRemoveMenu(BaseMenu): )[1:] print(menu, end="") - def toggle_all(self) -> None: + def toggle_all(self, **kwargs) -> None: 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) -> None: + def toggle_remove_moonraker_service(self, **kwargs) -> None: self.remove_moonraker_service = not self.remove_moonraker_service - def toggle_remove_moonraker_dir(self) -> None: + def toggle_remove_moonraker_dir(self, **kwargs) -> None: self.remove_moonraker_dir = not self.remove_moonraker_dir - def toggle_remove_moonraker_env(self) -> None: + def toggle_remove_moonraker_env(self, **kwargs) -> None: self.remove_moonraker_env = not self.remove_moonraker_env - def toggle_remove_moonraker_polkit(self) -> None: + def toggle_remove_moonraker_polkit(self, **kwargs) -> None: self.remove_moonraker_polkit = not self.remove_moonraker_polkit - def toggle_delete_moonraker_logs(self) -> None: + def toggle_delete_moonraker_logs(self, **kwargs) -> None: self.delete_moonraker_logs = not self.delete_moonraker_logs - def run_removal_process(self) -> None: + def run_removal_process(self, **kwargs) -> None: if ( not self.remove_moonraker_service and not self.remove_moonraker_dir