From 4a5d1a971a57ed1b45801114dbfaa5bba22e8f9e Mon Sep 17 00:00:00 2001 From: dw-0 Date: Thu, 2 May 2024 19:11:34 +0200 Subject: [PATCH] refactor: rearrange input parameters for git_clone_wrapper Signed-off-by: Dominik Willner --- kiauh/components/crowsnest/crowsnest.py | 4 ++-- kiauh/components/klipper/klipper_setup.py | 2 +- kiauh/components/moonraker/moonraker_setup.py | 2 +- .../webui_client/client_config/client_config_setup.py | 2 +- kiauh/core/menus/settings_menu.py | 2 +- .../mainsail_theme_installer_extension.py | 2 +- kiauh/utils/git_utils.py | 4 +++- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/kiauh/components/crowsnest/crowsnest.py b/kiauh/components/crowsnest/crowsnest.py index 68d9fcc..e2f022b 100644 --- a/kiauh/components/crowsnest/crowsnest.py +++ b/kiauh/components/crowsnest/crowsnest.py @@ -39,7 +39,7 @@ from utils.sys_utils import ( def install_crowsnest() -> None: # Step 1: Clone crowsnest repo - git_clone_wrapper(CROWSNEST_REPO, "master", CROWSNEST_DIR) + git_clone_wrapper(CROWSNEST_REPO, CROWSNEST_DIR, "master") # Step 2: Install dependencies requirements: List[str] = check_package_install(["make"]) @@ -106,7 +106,7 @@ def update_crowsnest() -> None: control_systemd_service("crowsnest", "stop") if not CROWSNEST_DIR.exists(): - git_clone_wrapper(CROWSNEST_REPO, "master", CROWSNEST_DIR) + git_clone_wrapper(CROWSNEST_REPO, CROWSNEST_DIR, "master") else: Logger.print_status("Updating Crowsnest ...") diff --git a/kiauh/components/klipper/klipper_setup.py b/kiauh/components/klipper/klipper_setup.py index bcf0634..d873762 100644 --- a/kiauh/components/klipper/klipper_setup.py +++ b/kiauh/components/klipper/klipper_setup.py @@ -111,7 +111,7 @@ def setup_klipper_prerequesites() -> None: repo = settings.get("klipper", "repo_url") branch = settings.get("klipper", "branch") - git_clone_wrapper(repo, branch, KLIPPER_DIR) + git_clone_wrapper(repo, KLIPPER_DIR, branch) # install klipper dependencies and create python virtualenv try: diff --git a/kiauh/components/moonraker/moonraker_setup.py b/kiauh/components/moonraker/moonraker_setup.py index 67350a9..2fd8452 100644 --- a/kiauh/components/moonraker/moonraker_setup.py +++ b/kiauh/components/moonraker/moonraker_setup.py @@ -132,7 +132,7 @@ def setup_moonraker_prerequesites() -> None: repo = settings.get("moonraker", "repo_url") branch = settings.get("moonraker", "branch") - git_clone_wrapper(repo, branch, MOONRAKER_DIR) + git_clone_wrapper(repo, MOONRAKER_DIR, branch) # install moonraker dependencies and create python virtualenv install_moonraker_packages(MOONRAKER_DIR) diff --git a/kiauh/components/webui_client/client_config/client_config_setup.py b/kiauh/components/webui_client/client_config/client_config_setup.py index f6a2be1..bd37184 100644 --- a/kiauh/components/webui_client/client_config/client_config_setup.py +++ b/kiauh/components/webui_client/client_config/client_config_setup.py @@ -85,7 +85,7 @@ def download_client_config(client_config: BaseWebClientConfig) -> None: Logger.print_status(f"Downloading {client_config.display_name} ...") repo = client_config.repo_url target_dir = client_config.config_dir - git_clone_wrapper(repo, None, target_dir) + git_clone_wrapper(repo, target_dir) except Exception: Logger.print_error(f"Downloading {client_config.display_name} failed!") raise diff --git a/kiauh/core/menus/settings_menu.py b/kiauh/core/menus/settings_menu.py index 5a795f8..786f3ed 100644 --- a/kiauh/core/menus/settings_menu.py +++ b/kiauh/core/menus/settings_menu.py @@ -199,7 +199,7 @@ class SettingsMenu(BaseMenu): repo = self.kiauh_settings.get(name, "repo_url") branch = self.kiauh_settings.get(name, "branch") - git_clone_wrapper(repo, branch, target_dir) + git_clone_wrapper(repo, target_dir, branch) im.start_all_instance() diff --git a/kiauh/extensions/mainsail_theme_installer/mainsail_theme_installer_extension.py b/kiauh/extensions/mainsail_theme_installer/mainsail_theme_installer_extension.py index 99c4049..fec24d7 100644 --- a/kiauh/extensions/mainsail_theme_installer/mainsail_theme_installer_extension.py +++ b/kiauh/extensions/mainsail_theme_installer/mainsail_theme_installer_extension.py @@ -147,7 +147,7 @@ class MainsailThemeInstallMenu(BaseMenu): return for printer in printer_list: - git_clone_wrapper(theme_repo_url, None, printer.cfg_dir.joinpath(".theme")) + git_clone_wrapper(theme_repo_url, printer.cfg_dir.joinpath(".theme")) if len(theme_data.get("short_note", "")) > 1: Logger.print_warn("Info from the creator:", prefix=False, start="\n") diff --git a/kiauh/utils/git_utils.py b/kiauh/utils/git_utils.py index d0e625d..3ccb0d1 100644 --- a/kiauh/utils/git_utils.py +++ b/kiauh/utils/git_utils.py @@ -13,7 +13,9 @@ from utils.input_utils import get_number_input, get_confirm from utils.logger import Logger -def git_clone_wrapper(repo: str, branch: Optional[str], target_dir: Path) -> None: +def git_clone_wrapper( + repo: str, target_dir: Path, branch: Optional[str] = None +) -> None: """ Clones a repository from the given URL and checks out the specified branch if given.