h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

refactor: rearrange input parameters for git_clone_wrapper

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2024-05-02 19:11:34 +02:00
parent 6407664e3e
commit 4a5d1a971a
7 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kiauh/components/crowsnest/crowsnest.py
View File

@@ -39,7 +39,7 @@ from utils.sys_utils import (
def install_crowsnest() -> None: def install_crowsnest() -> None:
# Step 1: Clone crowsnest repo # 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 # Step 2: Install dependencies
requirements: List[str] = check_package_install(["make"]) requirements: List[str] = check_package_install(["make"])
@@ -106,7 +106,7 @@ def update_crowsnest() -> None:
control_systemd_service("crowsnest", "stop") control_systemd_service("crowsnest", "stop")
if not CROWSNEST_DIR.exists(): if not CROWSNEST_DIR.exists():
git_clone_wrapper(CROWSNEST_REPO, "master", CROWSNEST_DIR) git_clone_wrapper(CROWSNEST_REPO, CROWSNEST_DIR, "master")
else: else:
Logger.print_status("Updating Crowsnest ...") Logger.print_status("Updating Crowsnest ...")

2
kiauh/components/klipper/klipper_setup.py
View File

@@ -111,7 +111,7 @@ def setup_klipper_prerequesites() -> None:
repo = settings.get("klipper", "repo_url") repo = settings.get("klipper", "repo_url")
branch = settings.get("klipper", "branch") 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 # install klipper dependencies and create python virtualenv
try: try:

2
kiauh/components/moonraker/moonraker_setup.py
View File

@@ -132,7 +132,7 @@ def setup_moonraker_prerequesites() -> None:
repo = settings.get("moonraker", "repo_url") repo = settings.get("moonraker", "repo_url")
branch = settings.get("moonraker", "branch") 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 dependencies and create python virtualenv
install_moonraker_packages(MOONRAKER_DIR) install_moonraker_packages(MOONRAKER_DIR)

2
kiauh/components/webui_client/client_config/client_config_setup.py
View File

@@ -85,7 +85,7 @@ def download_client_config(client_config: BaseWebClientConfig) -> None:
Logger.print_status(f"Downloading {client_config.display_name} ...") Logger.print_status(f"Downloading {client_config.display_name} ...")
repo = client_config.repo_url repo = client_config.repo_url
target_dir = client_config.config_dir target_dir = client_config.config_dir
git_clone_wrapper(repo, None, target_dir) git_clone_wrapper(repo, target_dir)
except Exception: except Exception:
Logger.print_error(f"Downloading {client_config.display_name} failed!") Logger.print_error(f"Downloading {client_config.display_name} failed!")
raise raise

2
kiauh/core/menus/settings_menu.py
View File

@@ -199,7 +199,7 @@ class SettingsMenu(BaseMenu):
repo = self.kiauh_settings.get(name, "repo_url") repo = self.kiauh_settings.get(name, "repo_url")
branch = self.kiauh_settings.get(name, "branch") 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() im.start_all_instance()

2
kiauh/extensions/mainsail_theme_installer/mainsail_theme_installer_extension.py
View File

@@ -147,7 +147,7 @@ class MainsailThemeInstallMenu(BaseMenu):
return return
for printer in printer_list: 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: if len(theme_data.get("short_note", "")) > 1:
Logger.print_warn("Info from the creator:", prefix=False, start="\n") Logger.print_warn("Info from the creator:", prefix=False, start="\n")

4
kiauh/utils/git_utils.py
View File

@@ -13,7 +13,9 @@ from utils.input_utils import get_number_input, get_confirm
from utils.logger import Logger 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. Clones a repository from the given URL and checks out the specified branch if given.