jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2025-12-23 15:53:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

chore(kiauh): reformat code / rename method

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2024-01-28 12:51:23 +01:00
parent 7820155094
commit 77f1089041
3 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,7 +70,7 @@ class InstallMenu(BaseMenu):
moonraker_setup.install_moonraker() moonraker_setup.install_moonraker()
def install_mainsail(self): def install_mainsail(self):
mainsail_setup.run_mainsail_installation() mainsail_setup.install_mainsail()
def install_fluidd(self): def install_fluidd(self):
print("install_fluidd") print("install_fluidd")

2
kiauh/modules/mainsail/mainsail_setup.py
View File

@@ -58,7 +58,7 @@ from kiauh.utils.system_utils import (
) )
def run_mainsail_installation() -> None: def install_mainsail() -> None:
mr_im = InstanceManager(Moonraker) mr_im = InstanceManager(Moonraker)
mr_instances: List[Moonraker] = mr_im.instances mr_instances: List[Moonraker] = mr_im.instances

40
kiauh/modules/moonraker/moonraker_setup.py
View File

@@ -52,27 +52,6 @@ from kiauh.utils.system_utils import (
) )
def check_moonraker_install_requirements() -> bool:
if not (sys.version_info.major >= 3 and sys.version_info.minor >= 7):
Logger.print_error("Versioncheck failed!")
Logger.print_error("Python 3.7 or newer required to run Moonraker.")
return False
kl_instance_count = len(InstanceManager(Klipper).instances)
if kl_instance_count < 1:
Logger.print_warn("Klipper not installed!")
Logger.print_warn("Moonraker cannot be installed! Install Klipper first.")
return False
mr_instance_count = len(InstanceManager(Moonraker).instances)
if mr_instance_count >= kl_instance_count:
Logger.print_warn("Unable to install more Moonraker instances!")
Logger.print_warn("More Klipper instances required.")
return False
return True
def install_moonraker() -> None: def install_moonraker() -> None:
if not check_moonraker_install_requirements(): if not check_moonraker_install_requirements():
return return
@@ -134,6 +113,25 @@ def install_moonraker() -> None:
if MAINSAIL_DIR.exists() and len(mr_im.instances) > 1: if MAINSAIL_DIR.exists() and len(mr_im.instances) > 1:
enable_mainsail_remotemode() enable_mainsail_remotemode()
def check_moonraker_install_requirements() -> bool:
if not (sys.version_info.major >= 3 and sys.version_info.minor >= 7):
Logger.print_error("Versioncheck failed!")
Logger.print_error("Python 3.7 or newer required to run Moonraker.")
return False
kl_instance_count = len(InstanceManager(Klipper).instances)
if kl_instance_count < 1:
Logger.print_warn("Klipper not installed!")
Logger.print_warn("Moonraker cannot be installed! Install Klipper first.")
return False
mr_instance_count = len(InstanceManager(Moonraker).instances)
if mr_instance_count >= kl_instance_count:
Logger.print_warn("Unable to install more Moonraker instances!")
Logger.print_warn("More Klipper instances required.")
return False
return True
def setup_moonraker_prerequesites() -> None: def setup_moonraker_prerequesites() -> None:
cm = ConfigManager(cfg_file=KIAUH_CFG) cm = ConfigManager(cfg_file=KIAUH_CFG)