From 85b4b68f16f66e89405c7c574d4d6e736b8f2ad3 Mon Sep 17 00:00:00 2001 From: dw-0 Date: Thu, 28 Dec 2023 13:47:24 +0100 Subject: [PATCH] refactor(Klipper/Moonraker): install new packages during updates Signed-off-by: Dominik Willner --- kiauh/core/menus/update_menu.py | 3 ++- kiauh/modules/klipper/klipper_setup.py | 6 ++++++ kiauh/modules/moonraker/moonraker_setup.py | 12 +++++++----- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/kiauh/core/menus/update_menu.py b/kiauh/core/menus/update_menu.py index 21da09b..50aae17 100644 --- a/kiauh/core/menus/update_menu.py +++ b/kiauh/core/menus/update_menu.py @@ -17,6 +17,7 @@ from kiauh.modules.klipper.klipper_setup import update_klipper from kiauh.modules.klipper.klipper_utils import ( get_klipper_status, ) +from kiauh.modules.moonraker.moonraker_setup import update_moonraker from kiauh.modules.moonraker.moonraker_utils import get_moonraker_status from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_WHITE @@ -92,7 +93,7 @@ class UpdateMenu(BaseMenu): update_klipper() def update_moonraker(self): - print("update_moonraker") + update_moonraker() def update_mainsail(self): print("update_mainsail") diff --git a/kiauh/modules/klipper/klipper_setup.py b/kiauh/modules/klipper/klipper_setup.py index 05aa038..5b0c6f7 100644 --- a/kiauh/modules/klipper/klipper_setup.py +++ b/kiauh/modules/klipper/klipper_setup.py @@ -157,6 +157,12 @@ def update_klipper() -> None: target_dir=KLIPPER_DIR, ) repo_manager.pull_repo() + + # install possible new system packages + install_klipper_packages(KLIPPER_DIR) + # install possible new python dependencies + install_python_requirements(KLIPPER_ENV_DIR, KLIPPER_REQUIREMENTS_TXT) + instance_manager.start_all_instance() diff --git a/kiauh/modules/moonraker/moonraker_setup.py b/kiauh/modules/moonraker/moonraker_setup.py index e7a8506..0b08a54 100644 --- a/kiauh/modules/moonraker/moonraker_setup.py +++ b/kiauh/modules/moonraker/moonraker_setup.py @@ -19,10 +19,7 @@ from kiauh.core.backup_manager.backup_manager import BackupManager from kiauh.core.config_manager.config_manager import ConfigManager from kiauh.core.instance_manager.instance_manager import InstanceManager from kiauh.modules.klipper.klipper import Klipper -from kiauh.modules.klipper.klipper_dialogs import ( - print_instance_overview, - print_update_warn_dialog, -) +from kiauh.modules.klipper.klipper_dialogs import print_instance_overview from kiauh.core.repo_manager.repo_manager import RepoManager from kiauh.modules.mainsail import MAINSAIL_DIR from kiauh.modules.mainsail.mainsail_utils import enable_mainsail_remotemode @@ -204,7 +201,6 @@ def handle_existing_instances(instance_list: List[Klipper]) -> bool: def update_moonraker() -> None: - print_update_warn_dialog() if not get_confirm("Update Moonraker now?"): return @@ -228,4 +224,10 @@ def update_moonraker() -> None: target_dir=MOONRAKER_DIR, ) repo_manager.pull_repo() + + # install possible new system packages + install_moonraker_packages(MOONRAKER_DIR) + # install possible new python dependencies + install_python_requirements(MOONRAKER_ENV_DIR, MOONRAKER_REQUIREMENTS_TXT) + instance_manager.start_all_instance()