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

refactor: update dependency management

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2024-05-11 22:16:36 +02:00
parent 9342c94096
commit a44508ead5
6 changed files with 74 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,6 +74,7 @@ def install_klipper() -> None:
try:
if not kl_im.instances:
check_install_dependencies(["git"])
setup_klipper_prerequesites()
count = 0

1
kiauh/components/klipper/klipper_utils.py
View File

@@ -260,6 +260,7 @@ def handle_disruptive_system_packages() -> None:
try:
cmd_sysctl_service(service, "mask")
except subprocess.CalledProcessError:
# todo: replace with Logger.print_dialog
warn_msg = textwrap.dedent(
f"""
KIAUH was unable to mask the {service} system service.

14
kiauh/components/klipperscreen/klipperscreen.py
View File

@@ -52,14 +52,17 @@ def install_klipperscreen() -> None:
mr_im = InstanceManager(Moonraker)
mr_instances = mr_im.instances
if not mr_instances:
warn_msg = [
Logger.print_dialog(
DialogType.WARNING,
[
"Moonraker not found! KlipperScreen will not properly work "
"without a working Moonraker installation.",
"\n\n",
"KlipperScreens update manager configuration for Moonraker "
"will not be added to any moonraker.conf.",
]
Logger.print_dialog(DialogType.WARNING, warn_msg)
],
end="",
)
if not get_confirm(
"Continue KlipperScreen installation?",
default_choice=False,
@@ -67,7 +70,7 @@ def install_klipperscreen() -> None:
):
return
package_list = ["wget", "curl", "unzip", "dfu-util"]
package_list = ["git", "wget", "curl", "unzip", "dfu-util"]
check_install_dependencies(package_list)
git_clone_wrapper(KLIPPERSCREEN_REPO, KLIPPERSCREEN_DIR)
@@ -80,7 +83,8 @@ def install_klipperscreen() -> None:
mr_im.restart_all_instance()
else:
Logger.print_info(
"Moonraker is not installed! Cannot add KlipperScreen to update manager!"
"Moonraker is not installed! Cannot add "
"KlipperScreen to update manager!"
)
Logger.print_ok("KlipperScreen successfully installed!")
except CalledProcessError as e:

14
kiauh/components/mobileraker/mobileraker.py
View File

@@ -52,13 +52,16 @@ def install_mobileraker() -> None:
mr_im = InstanceManager(Moonraker)
mr_instances = mr_im.instances
if not mr_instances:
warn_msg = [
Logger.print_dialog(
DialogType.WARNING,
[
"Moonraker not found! Mobileraker's companion will not properly work "
"without a working Moonraker installation.",
"Mobileraker's companion's update manager configuration for Moonraker "
"will not be added to any moonraker.conf.",
]
Logger.print_dialog(DialogType.WARNING, warn_msg)
],
end="",
)
if not get_confirm(
"Continue Mobileraker's companion installation?",
default_choice=False,
@@ -66,7 +69,7 @@ def install_mobileraker() -> None:
):
return
package_list = ["wget", "curl", "unzip", "dfu-util"]
package_list = ["git", "wget", "curl", "unzip", "dfu-util"]
check_install_dependencies(package_list)
git_clone_wrapper(MOBILERAKER_REPO, MOBILERAKER_DIR)
@@ -79,7 +82,8 @@ def install_mobileraker() -> None:
mr_im.restart_all_instance()
else:
Logger.print_info(
"Moonraker is not installed! Cannot add Mobileraker's companion to update manager!"
"Moonraker is not installed! Cannot add Mobileraker's "
"companion to update manager!"
)
Logger.print_ok("Mobileraker's companion successfully installed!")
except CalledProcessError as e:

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

@@ -6,7 +6,7 @@
# #
# This file may be distributed under the terms of the GNU GPLv3 license #
# ======================================================================= #
import json
import subprocess
from pathlib import Path
@@ -86,6 +86,9 @@ def install_moonraker() -> None:
instance_names.append(klipper_instances[index].suffix)
create_example_cfg = get_confirm("Create example moonraker.conf?")
try:
check_install_dependencies(["git"])
setup_moonraker_prerequesites()
install_moonraker_polkit()
@@ -100,7 +103,8 @@ def install_moonraker() -> None:
mr_im.enable_instance()
if create_example_cfg:
# if a webclient and/or it's config is installed, patch its update section to the config
# if a webclient and/or it's config is installed, patch
# its update section to the config
clients = get_existing_clients()
create_example_moonraker_conf(current_instance, used_ports_map, clients)
@@ -113,6 +117,10 @@ def install_moonraker() -> None:
if MainsailData().client_dir.exists() and len(mr_im.instances) > 1:
enable_mainsail_remotemode()
except Exception as e:
Logger.print_error(f"Error while installing Moonraker: {e}")
return
def check_moonraker_install_requirements() -> bool:
def check_klipper_instances() -> bool:
@@ -140,9 +148,19 @@ def setup_moonraker_prerequesites() -> None:
def install_moonraker_packages(moonraker_dir: Path) -> None:
script = moonraker_dir.joinpath("scripts/install-moonraker.sh")
packages = parse_packages_from_file(script)
check_install_dependencies(packages)
install_script = moonraker_dir.joinpath("scripts/install-moonraker.sh")
deps_json = MOONRAKER_DIR.joinpath("scripts/system-dependencies.json")
moonraker_deps = []
if deps_json.exists():
moonraker_deps = json.load(deps_json).get("debian", [])
elif install_script.exists():
moonraker_deps = parse_packages_from_file(install_script)
if not moonraker_deps:
raise ValueError("Error reading Moonraker dependencies!")
check_install_dependencies(moonraker_deps)
def install_moonraker_polkit() -> None:

2
kiauh/components/webui_client/client_setup.py
View File

@@ -119,7 +119,7 @@ def install_client(client: BaseWebClient) -> None:
)
valid_port = is_valid_port(port, ports_in_use)
check_install_dependencies(["nginx"])
check_install_dependencies(["nginx", "unzip"])
try:
download_client(client)