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

refactor(Mainsail): enable remote mode if moonraker multi instance

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2023-12-27 00:11:11 +01:00
parent 9dedf38079
commit ad0dbf63b8
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,21 +59,22 @@ from kiauh.utils.system_utils import (
def run_mainsail_installation() -> None: def run_mainsail_installation() -> None:
im_mr = InstanceManager(Moonraker) mr_im = InstanceManager(Moonraker)
is_moonraker_installed = len(im_mr.instances) > 0 mr_instances: List[Moonraker] = mr_im.instances
enable_remotemode = False enable_remotemode = False
if not is_moonraker_installed: if not mr_instances:
print_moonraker_not_found_dialog() print_moonraker_not_found_dialog()
do_continue = get_confirm("Continue Mainsail installation?", allow_go_back=True) if not get_confirm("Continue Mainsail installation?", allow_go_back=True):
if do_continue:
enable_remotemode = True
else:
return return
is_mainsail_installed = Path.home().joinpath("mainsail").exists() # if moonraker is not installed or multiple instances
# are installed we enable mainsails remote mode
if not mr_instances or len(mr_instances) > 1:
enable_remotemode = True
do_reinstall = False do_reinstall = False
if is_mainsail_installed: if Path.home().joinpath("mainsail").exists():
print_mainsail_already_installed_dialog() print_mainsail_already_installed_dialog()
do_reinstall = get_confirm("Re-install Mainsail?", allow_go_back=True) do_reinstall = get_confirm("Re-install Mainsail?", allow_go_back=True)
if do_reinstall: if do_reinstall:
@@ -81,10 +82,10 @@ def run_mainsail_installation() -> None:
else: else:
return return
im_kl = InstanceManager(Klipper) kl_im = InstanceManager(Klipper)
is_klipper_installed = len(im_kl.instances) > 0 kl_instances = kl_im.instances
install_ms_config = False install_ms_config = False
if is_klipper_installed: if kl_instances:
print_install_mainsail_config_dialog() print_install_mainsail_config_dialog()
question = "Download the recommended macros?" question = "Download the recommended macros?"
install_ms_config = get_confirm(question, allow_go_back=False) install_ms_config = get_confirm(question, allow_go_back=False)
@@ -108,31 +109,31 @@ def run_mainsail_installation() -> None:
restore_config_json() restore_config_json()
if enable_remotemode: if enable_remotemode:
enable_mainsail_remotemode() enable_mainsail_remotemode()
if is_moonraker_installed: if mr_instances:
patch_moonraker_conf( patch_moonraker_conf(
im_mr.instances, mr_instances,
"Mainsail", "Mainsail",
"update_manager mainsail", "update_manager mainsail",
"mainsail-updater.conf", "mainsail-updater.conf",
) )
im_mr.restart_all_instance() mr_im.restart_all_instance()
if install_ms_config and is_klipper_installed: if install_ms_config and kl_instances:
download_mainsail_cfg() download_mainsail_cfg()
create_mainsail_cfg_symlink(im_kl.instances) create_mainsail_cfg_symlink(kl_instances)
patch_moonraker_conf( patch_moonraker_conf(
im_mr.instances, mr_instances,
"mainsail-config", "mainsail-config",
"update_manager mainsail-config", "update_manager mainsail-config",
"mainsail-config-updater.conf", "mainsail-config-updater.conf",
) )
patch_printer_config(im_kl.instances) patch_printer_config(kl_instances)
im_kl.restart_all_instance() kl_im.restart_all_instance()
copy_upstream_nginx_cfg() copy_upstream_nginx_cfg()
copy_common_vars_nginx_cfg() copy_common_vars_nginx_cfg()
create_mainsail_nginx_cfg(mainsail_port) create_mainsail_nginx_cfg(mainsail_port)
if is_klipper_installed: if kl_instances:
symlink_webui_nginx_log(im_kl.instances) symlink_webui_nginx_log(kl_instances)
control_systemd_service("nginx", "restart") control_systemd_service("nginx", "restart")
except Exception as e: except Exception as e: