diff --git a/kiauh/modules/__init__.py b/kiauh/components/__init__.py similarity index 100% rename from kiauh/modules/__init__.py rename to kiauh/components/__init__.py diff --git a/kiauh/modules/klipper/__init__.py b/kiauh/components/klipper/__init__.py similarity index 100% rename from kiauh/modules/klipper/__init__.py rename to kiauh/components/klipper/__init__.py diff --git a/kiauh/modules/klipper/klipper.py b/kiauh/components/klipper/klipper.py similarity index 98% rename from kiauh/modules/klipper/klipper.py rename to kiauh/components/klipper/klipper.py index a42eb53..78dc8f4 100644 --- a/kiauh/modules/klipper/klipper.py +++ b/kiauh/components/klipper/klipper.py @@ -14,7 +14,7 @@ from pathlib import Path from typing import List from kiauh.core.instance_manager.base_instance import BaseInstance -from kiauh.modules.klipper import KLIPPER_DIR, KLIPPER_ENV_DIR, MODULE_PATH +from kiauh.components.klipper import KLIPPER_DIR, KLIPPER_ENV_DIR, MODULE_PATH from kiauh.utils.constants import SYSTEMD from kiauh.utils.logger import Logger diff --git a/kiauh/modules/klipper/klipper_dialogs.py b/kiauh/components/klipper/klipper_dialogs.py similarity index 100% rename from kiauh/modules/klipper/klipper_dialogs.py rename to kiauh/components/klipper/klipper_dialogs.py diff --git a/kiauh/modules/klipper/klipper_remove.py b/kiauh/components/klipper/klipper_remove.py similarity index 95% rename from kiauh/modules/klipper/klipper_remove.py rename to kiauh/components/klipper/klipper_remove.py index 4037b49..3534094 100644 --- a/kiauh/modules/klipper/klipper_remove.py +++ b/kiauh/components/klipper/klipper_remove.py @@ -13,9 +13,9 @@ import shutil from typing import List, Union from kiauh.core.instance_manager.instance_manager import InstanceManager -from kiauh.modules.klipper import KLIPPER_DIR, KLIPPER_ENV_DIR -from kiauh.modules.klipper.klipper import Klipper -from kiauh.modules.klipper.klipper_dialogs import print_instance_overview +from kiauh.components.klipper import KLIPPER_DIR, KLIPPER_ENV_DIR +from kiauh.components.klipper.klipper import Klipper +from kiauh.components.klipper.klipper_dialogs import print_instance_overview from kiauh.utils.filesystem_utils import remove_file from kiauh.utils.input_utils import get_selection_input from kiauh.utils.logger import Logger diff --git a/kiauh/modules/klipper/klipper_setup.py b/kiauh/components/klipper/klipper_setup.py similarity index 95% rename from kiauh/modules/klipper/klipper_setup.py rename to kiauh/components/klipper/klipper_setup.py index b5b4def..bed720d 100644 --- a/kiauh/modules/klipper/klipper_setup.py +++ b/kiauh/components/klipper/klipper_setup.py @@ -15,16 +15,16 @@ from kiauh import KIAUH_CFG from kiauh.core.backup_manager.backup_manager import BackupManager from kiauh.core.config_manager.config_manager import ConfigManager from kiauh.core.instance_manager.instance_manager import InstanceManager -from kiauh.modules.klipper import ( +from kiauh.components.klipper import ( EXIT_KLIPPER_SETUP, DEFAULT_KLIPPER_REPO_URL, KLIPPER_DIR, KLIPPER_ENV_DIR, KLIPPER_REQUIREMENTS_TXT, ) -from kiauh.modules.klipper.klipper import Klipper -from kiauh.modules.klipper.klipper_dialogs import print_update_warn_dialog -from kiauh.modules.klipper.klipper_utils import ( +from kiauh.components.klipper.klipper import Klipper +from kiauh.components.klipper.klipper_dialogs import print_update_warn_dialog +from kiauh.components.klipper.klipper_utils import ( handle_disruptive_system_packages, check_user_groups, handle_to_multi_instance_conversion, @@ -37,7 +37,7 @@ from kiauh.modules.klipper.klipper_utils import ( handle_instance_naming, ) from kiauh.core.repo_manager.repo_manager import RepoManager -from kiauh.modules.moonraker.moonraker import Moonraker +from kiauh.components.moonraker.moonraker import Moonraker from kiauh.utils.input_utils import get_confirm from kiauh.utils.logger import Logger from kiauh.utils.system_utils import ( diff --git a/kiauh/modules/klipper/klipper_utils.py b/kiauh/components/klipper/klipper_utils.py similarity index 96% rename from kiauh/modules/klipper/klipper_utils.py rename to kiauh/components/klipper/klipper_utils.py index 3169fd6..c5de7bf 100644 --- a/kiauh/modules/klipper/klipper_utils.py +++ b/kiauh/components/klipper/klipper_utils.py @@ -24,16 +24,16 @@ from kiauh.core.instance_manager.base_instance import BaseInstance from kiauh.core.instance_manager.instance_manager import InstanceManager from kiauh.core.instance_manager.name_scheme import NameScheme from kiauh.core.repo_manager.repo_manager import RepoManager -from kiauh.modules.klipper import MODULE_PATH, KLIPPER_DIR, KLIPPER_ENV_DIR -from kiauh.modules.klipper.klipper import Klipper -from kiauh.modules.klipper.klipper_dialogs import ( +from kiauh.components.klipper import MODULE_PATH, KLIPPER_DIR, KLIPPER_ENV_DIR +from kiauh.components.klipper.klipper import Klipper +from kiauh.components.klipper.klipper_dialogs import ( print_missing_usergroup_dialog, print_instance_overview, print_select_instance_count_dialog, print_select_custom_name_dialog, ) -from kiauh.modules.moonraker.moonraker import Moonraker -from kiauh.modules.moonraker.moonraker_utils import moonraker_to_multi_conversion +from kiauh.components.moonraker.moonraker import Moonraker +from kiauh.components.moonraker.moonraker_utils import moonraker_to_multi_conversion from kiauh.utils.common import get_install_status_common from kiauh.utils.constants import CURRENT_USER from kiauh.utils.input_utils import get_confirm, get_string_input, get_number_input diff --git a/kiauh/modules/klipper/menus/__init__.py b/kiauh/components/klipper/menus/__init__.py similarity index 100% rename from kiauh/modules/klipper/menus/__init__.py rename to kiauh/components/klipper/menus/__init__.py diff --git a/kiauh/modules/klipper/menus/klipper_remove_menu.py b/kiauh/components/klipper/menus/klipper_remove_menu.py similarity index 97% rename from kiauh/modules/klipper/menus/klipper_remove_menu.py rename to kiauh/components/klipper/menus/klipper_remove_menu.py index 61fdc94..a75d58d 100644 --- a/kiauh/modules/klipper/menus/klipper_remove_menu.py +++ b/kiauh/components/klipper/menus/klipper_remove_menu.py @@ -13,8 +13,7 @@ import textwrap from kiauh.core.menus import BACK_HELP_FOOTER from kiauh.core.menus.base_menu import BaseMenu -from kiauh.modules.klipper import klipper_remove -from kiauh.modules.moonraker import moonraker_remove +from kiauh.components.klipper import klipper_remove from kiauh.utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN diff --git a/kiauh/modules/klipper/res/klipper.env b/kiauh/components/klipper/res/klipper.env similarity index 100% rename from kiauh/modules/klipper/res/klipper.env rename to kiauh/components/klipper/res/klipper.env diff --git a/kiauh/modules/klipper/res/klipper.service b/kiauh/components/klipper/res/klipper.service similarity index 100% rename from kiauh/modules/klipper/res/klipper.service rename to kiauh/components/klipper/res/klipper.service diff --git a/kiauh/modules/klipper/res/printer.cfg b/kiauh/components/klipper/res/printer.cfg similarity index 100% rename from kiauh/modules/klipper/res/printer.cfg rename to kiauh/components/klipper/res/printer.cfg diff --git a/kiauh/modules/log_uploads/__init__.py b/kiauh/components/log_uploads/__init__.py similarity index 100% rename from kiauh/modules/log_uploads/__init__.py rename to kiauh/components/log_uploads/__init__.py diff --git a/kiauh/modules/log_uploads/log_upload_utils.py b/kiauh/components/log_uploads/log_upload_utils.py similarity index 95% rename from kiauh/modules/log_uploads/log_upload_utils.py rename to kiauh/components/log_uploads/log_upload_utils.py index c61dbc6..9ce95c8 100644 --- a/kiauh/modules/log_uploads/log_upload_utils.py +++ b/kiauh/components/log_uploads/log_upload_utils.py @@ -15,8 +15,8 @@ from pathlib import Path import urllib.request from kiauh.core.instance_manager.instance_manager import InstanceManager -from kiauh.modules.klipper.klipper import Klipper -from kiauh.modules.log_uploads import LogFile +from kiauh.components.klipper.klipper import Klipper +from kiauh.components.log_uploads import LogFile from kiauh.utils.logger import Logger diff --git a/kiauh/modules/log_uploads/menus/log_upload_menu.py b/kiauh/components/log_uploads/menus/log_upload_menu.py similarity index 93% rename from kiauh/modules/log_uploads/menus/log_upload_menu.py rename to kiauh/components/log_uploads/menus/log_upload_menu.py index 9c96c5c..c140b2e 100644 --- a/kiauh/modules/log_uploads/menus/log_upload_menu.py +++ b/kiauh/components/log_uploads/menus/log_upload_menu.py @@ -13,8 +13,8 @@ import textwrap from kiauh.core.menus import BACK_FOOTER from kiauh.core.menus.base_menu import BaseMenu -from kiauh.modules.log_uploads.log_upload_utils import upload_logfile -from kiauh.modules.log_uploads.log_upload_utils import get_logfile_list +from kiauh.components.log_uploads.log_upload_utils import upload_logfile +from kiauh.components.log_uploads.log_upload_utils import get_logfile_list from kiauh.utils.constants import RESET_FORMAT, COLOR_YELLOW diff --git a/kiauh/modules/mainsail/__init__.py b/kiauh/components/mainsail/__init__.py similarity index 100% rename from kiauh/modules/mainsail/__init__.py rename to kiauh/components/mainsail/__init__.py diff --git a/kiauh/modules/mainsail/mainsail_dialogs.py b/kiauh/components/mainsail/mainsail_dialogs.py similarity index 100% rename from kiauh/modules/mainsail/mainsail_dialogs.py rename to kiauh/components/mainsail/mainsail_dialogs.py diff --git a/kiauh/modules/mainsail/mainsail_remove.py b/kiauh/components/mainsail/mainsail_remove.py similarity index 95% rename from kiauh/modules/mainsail/mainsail_remove.py rename to kiauh/components/mainsail/mainsail_remove.py index 7a10041..fc396ba 100644 --- a/kiauh/modules/mainsail/mainsail_remove.py +++ b/kiauh/components/mainsail/mainsail_remove.py @@ -17,10 +17,10 @@ from typing import List from kiauh.core.config_manager.config_manager import ConfigManager from kiauh.core.instance_manager.instance_manager import InstanceManager -from kiauh.modules.klipper.klipper import Klipper -from kiauh.modules.mainsail import MAINSAIL_DIR, MAINSAIL_CONFIG_DIR -from kiauh.modules.mainsail.mainsail_utils import backup_config_json -from kiauh.modules.moonraker.moonraker import Moonraker +from kiauh.components.klipper.klipper import Klipper +from kiauh.components.mainsail import MAINSAIL_DIR, MAINSAIL_CONFIG_DIR +from kiauh.components.mainsail.mainsail_utils import backup_config_json +from kiauh.components.moonraker.moonraker import Moonraker from kiauh.utils import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED from kiauh.utils.filesystem_utils import remove_file from kiauh.utils.logger import Logger diff --git a/kiauh/modules/mainsail/mainsail_setup.py b/kiauh/components/mainsail/mainsail_setup.py similarity index 97% rename from kiauh/modules/mainsail/mainsail_setup.py rename to kiauh/components/mainsail/mainsail_setup.py index 294db45..0149794 100644 --- a/kiauh/modules/mainsail/mainsail_setup.py +++ b/kiauh/components/mainsail/mainsail_setup.py @@ -17,27 +17,27 @@ from kiauh import KIAUH_CFG from kiauh.core.config_manager.config_manager import ConfigManager from kiauh.core.instance_manager.instance_manager import InstanceManager from kiauh.core.repo_manager.repo_manager import RepoManager -from kiauh.modules.klipper.klipper import Klipper -from kiauh.modules.mainsail import ( +from kiauh.components.klipper.klipper import Klipper +from kiauh.components.mainsail import ( MAINSAIL_URL, MAINSAIL_DIR, MAINSAIL_CONFIG_DIR, MAINSAIL_CONFIG_REPO_URL, MODULE_PATH, ) -from kiauh.modules.mainsail.mainsail_dialogs import ( +from kiauh.components.mainsail.mainsail_dialogs import ( print_moonraker_not_found_dialog, print_mainsail_already_installed_dialog, print_install_mainsail_config_dialog, print_mainsail_port_select_dialog, ) -from kiauh.modules.mainsail.mainsail_utils import ( +from kiauh.components.mainsail.mainsail_utils import ( restore_config_json, enable_mainsail_remotemode, backup_config_json, symlink_webui_nginx_log, ) -from kiauh.modules.moonraker.moonraker import Moonraker +from kiauh.components.moonraker.moonraker import Moonraker from kiauh.utils import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED from kiauh.utils.common import check_install_dependencies from kiauh.utils.filesystem_utils import ( diff --git a/kiauh/modules/mainsail/mainsail_utils.py b/kiauh/components/mainsail/mainsail_utils.py similarity index 96% rename from kiauh/modules/mainsail/mainsail_utils.py rename to kiauh/components/mainsail/mainsail_utils.py index 1fdfa5a..5f08765 100644 --- a/kiauh/modules/mainsail/mainsail_utils.py +++ b/kiauh/components/mainsail/mainsail_utils.py @@ -16,8 +16,8 @@ from pathlib import Path from typing import List from kiauh.core.backup_manager.backup_manager import BackupManager -from kiauh.modules.klipper.klipper import Klipper -from kiauh.modules.mainsail import MAINSAIL_CONFIG_JSON, MAINSAIL_DIR +from kiauh.components.klipper.klipper import Klipper +from kiauh.components.mainsail import MAINSAIL_CONFIG_JSON, MAINSAIL_DIR from kiauh.utils import NGINX_SITES_AVAILABLE, NGINX_CONFD from kiauh.utils.common import get_install_status_webui from kiauh.utils.logger import Logger diff --git a/kiauh/modules/mainsail/menus/__init__.py b/kiauh/components/mainsail/menus/__init__.py similarity index 100% rename from kiauh/modules/mainsail/menus/__init__.py rename to kiauh/components/mainsail/menus/__init__.py diff --git a/kiauh/modules/mainsail/menus/mainsail_remove_menu.py b/kiauh/components/mainsail/menus/mainsail_remove_menu.py similarity index 98% rename from kiauh/modules/mainsail/menus/mainsail_remove_menu.py rename to kiauh/components/mainsail/menus/mainsail_remove_menu.py index e2ec352..0beca2a 100644 --- a/kiauh/modules/mainsail/menus/mainsail_remove_menu.py +++ b/kiauh/components/mainsail/menus/mainsail_remove_menu.py @@ -13,7 +13,7 @@ import textwrap from kiauh.core.menus import BACK_HELP_FOOTER from kiauh.core.menus.base_menu import BaseMenu -from kiauh.modules.mainsail import mainsail_remove +from kiauh.components.mainsail import mainsail_remove from kiauh.utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN diff --git a/kiauh/modules/mainsail/res/mainsail-config-updater.conf b/kiauh/components/mainsail/res/mainsail-config-updater.conf similarity index 100% rename from kiauh/modules/mainsail/res/mainsail-config-updater.conf rename to kiauh/components/mainsail/res/mainsail-config-updater.conf diff --git a/kiauh/modules/mainsail/res/mainsail-updater.conf b/kiauh/components/mainsail/res/mainsail-updater.conf similarity index 100% rename from kiauh/modules/mainsail/res/mainsail-updater.conf rename to kiauh/components/mainsail/res/mainsail-updater.conf diff --git a/kiauh/modules/moonraker/__init__.py b/kiauh/components/moonraker/__init__.py similarity index 100% rename from kiauh/modules/moonraker/__init__.py rename to kiauh/components/moonraker/__init__.py diff --git a/kiauh/modules/moonraker/menus/__init__.py b/kiauh/components/moonraker/menus/__init__.py similarity index 100% rename from kiauh/modules/moonraker/menus/__init__.py rename to kiauh/components/moonraker/menus/__init__.py diff --git a/kiauh/modules/moonraker/menus/moonraker_remove_menu.py b/kiauh/components/moonraker/menus/moonraker_remove_menu.py similarity index 98% rename from kiauh/modules/moonraker/menus/moonraker_remove_menu.py rename to kiauh/components/moonraker/menus/moonraker_remove_menu.py index c193f85..f8a9ae4 100644 --- a/kiauh/modules/moonraker/menus/moonraker_remove_menu.py +++ b/kiauh/components/moonraker/menus/moonraker_remove_menu.py @@ -13,7 +13,7 @@ import textwrap from kiauh.core.menus import BACK_HELP_FOOTER from kiauh.core.menus.base_menu import BaseMenu -from kiauh.modules.moonraker import moonraker_remove +from kiauh.components.moonraker import moonraker_remove from kiauh.utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN diff --git a/kiauh/modules/moonraker/moonraker.py b/kiauh/components/moonraker/moonraker.py similarity index 98% rename from kiauh/modules/moonraker/moonraker.py rename to kiauh/components/moonraker/moonraker.py index 89f47b3..688b825 100644 --- a/kiauh/modules/moonraker/moonraker.py +++ b/kiauh/components/moonraker/moonraker.py @@ -15,7 +15,7 @@ from typing import List, Union from kiauh.core.config_manager.config_manager import ConfigManager from kiauh.core.instance_manager.base_instance import BaseInstance -from kiauh.modules.moonraker import MOONRAKER_DIR, MOONRAKER_ENV_DIR, MODULE_PATH +from kiauh.components.moonraker import MOONRAKER_DIR, MOONRAKER_ENV_DIR, MODULE_PATH from kiauh.utils.constants import SYSTEMD from kiauh.utils.logger import Logger diff --git a/kiauh/modules/moonraker/moonraker_dialogs.py b/kiauh/components/moonraker/moonraker_dialogs.py similarity index 95% rename from kiauh/modules/moonraker/moonraker_dialogs.py rename to kiauh/components/moonraker/moonraker_dialogs.py index f1576cd..62867bd 100644 --- a/kiauh/modules/moonraker/moonraker_dialogs.py +++ b/kiauh/components/moonraker/moonraker_dialogs.py @@ -13,8 +13,8 @@ import textwrap from typing import List from kiauh.core.menus.base_menu import print_back_footer -from kiauh.modules.klipper.klipper import Klipper -from kiauh.modules.moonraker.moonraker import Moonraker +from kiauh.components.klipper.klipper import Klipper +from kiauh.components.moonraker.moonraker import Moonraker from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN diff --git a/kiauh/modules/moonraker/moonraker_remove.py b/kiauh/components/moonraker/moonraker_remove.py similarity index 96% rename from kiauh/modules/moonraker/moonraker_remove.py rename to kiauh/components/moonraker/moonraker_remove.py index 4ddc0c9..cc76be8 100644 --- a/kiauh/modules/moonraker/moonraker_remove.py +++ b/kiauh/components/moonraker/moonraker_remove.py @@ -14,9 +14,9 @@ import subprocess from typing import List, Union from kiauh.core.instance_manager.instance_manager import InstanceManager -from kiauh.modules.klipper.klipper_dialogs import print_instance_overview -from kiauh.modules.moonraker import MOONRAKER_DIR, MOONRAKER_ENV_DIR -from kiauh.modules.moonraker.moonraker import Moonraker +from kiauh.components.klipper.klipper_dialogs import print_instance_overview +from kiauh.components.moonraker import MOONRAKER_DIR, MOONRAKER_ENV_DIR +from kiauh.components.moonraker.moonraker import Moonraker from kiauh.utils.filesystem_utils import remove_file from kiauh.utils.input_utils import get_selection_input from kiauh.utils.logger import Logger diff --git a/kiauh/modules/moonraker/moonraker_setup.py b/kiauh/components/moonraker/moonraker_setup.py similarity index 93% rename from kiauh/modules/moonraker/moonraker_setup.py rename to kiauh/components/moonraker/moonraker_setup.py index faf50ca..066d627 100644 --- a/kiauh/modules/moonraker/moonraker_setup.py +++ b/kiauh/components/moonraker/moonraker_setup.py @@ -18,12 +18,12 @@ from kiauh import KIAUH_CFG from kiauh.core.backup_manager.backup_manager import BackupManager from kiauh.core.config_manager.config_manager import ConfigManager from kiauh.core.instance_manager.instance_manager import InstanceManager -from kiauh.modules.klipper.klipper import Klipper -from kiauh.modules.klipper.klipper_dialogs import print_instance_overview +from kiauh.components.klipper.klipper import Klipper +from kiauh.components.klipper.klipper_dialogs import print_instance_overview from kiauh.core.repo_manager.repo_manager import RepoManager -from kiauh.modules.mainsail import MAINSAIL_DIR -from kiauh.modules.mainsail.mainsail_utils import enable_mainsail_remotemode -from kiauh.modules.moonraker import ( +from kiauh.components.mainsail import MAINSAIL_DIR +from kiauh.components.mainsail.mainsail_utils import enable_mainsail_remotemode +from kiauh.components.moonraker import ( EXIT_MOONRAKER_SETUP, DEFAULT_MOONRAKER_REPO_URL, MOONRAKER_DIR, @@ -34,9 +34,9 @@ from kiauh.modules.moonraker import ( POLKIT_USR_FILE, POLKIT_SCRIPT, ) -from kiauh.modules.moonraker.moonraker import Moonraker -from kiauh.modules.moonraker.moonraker_dialogs import print_moonraker_overview -from kiauh.modules.moonraker.moonraker_utils import create_example_moonraker_conf +from kiauh.components.moonraker.moonraker import Moonraker +from kiauh.components.moonraker.moonraker_dialogs import print_moonraker_overview +from kiauh.components.moonraker.moonraker_utils import create_example_moonraker_conf from kiauh.utils.filesystem_utils import check_file_exist from kiauh.utils.input_utils import ( get_confirm, diff --git a/kiauh/modules/moonraker/moonraker_utils.py b/kiauh/components/moonraker/moonraker_utils.py similarity index 95% rename from kiauh/modules/moonraker/moonraker_utils.py rename to kiauh/components/moonraker/moonraker_utils.py index 35fe973..2533b4d 100644 --- a/kiauh/modules/moonraker/moonraker_utils.py +++ b/kiauh/components/moonraker/moonraker_utils.py @@ -15,15 +15,15 @@ from typing import Dict, Literal, List, Union from kiauh.core.config_manager.config_manager import ConfigManager from kiauh.core.instance_manager.instance_manager import InstanceManager from kiauh.core.repo_manager.repo_manager import RepoManager -from kiauh.modules.mainsail import MAINSAIL_DIR -from kiauh.modules.mainsail.mainsail_utils import enable_mainsail_remotemode -from kiauh.modules.moonraker import ( +from kiauh.components.mainsail import MAINSAIL_DIR +from kiauh.components.mainsail.mainsail_utils import enable_mainsail_remotemode +from kiauh.components.moonraker import ( DEFAULT_MOONRAKER_PORT, MODULE_PATH, MOONRAKER_DIR, MOONRAKER_ENV_DIR, ) -from kiauh.modules.moonraker.moonraker import Moonraker +from kiauh.components.moonraker.moonraker import Moonraker from kiauh.utils.common import get_install_status_common from kiauh.utils.logger import Logger from kiauh.utils.system_utils import ( diff --git a/kiauh/modules/moonraker/res/moonraker.conf b/kiauh/components/moonraker/res/moonraker.conf similarity index 100% rename from kiauh/modules/moonraker/res/moonraker.conf rename to kiauh/components/moonraker/res/moonraker.conf diff --git a/kiauh/modules/moonraker/res/moonraker.env b/kiauh/components/moonraker/res/moonraker.env similarity index 100% rename from kiauh/modules/moonraker/res/moonraker.env rename to kiauh/components/moonraker/res/moonraker.env diff --git a/kiauh/modules/moonraker/res/moonraker.service b/kiauh/components/moonraker/res/moonraker.service similarity index 100% rename from kiauh/modules/moonraker/res/moonraker.service rename to kiauh/components/moonraker/res/moonraker.service diff --git a/kiauh/core/menus/install_menu.py b/kiauh/core/menus/install_menu.py index 83344ab..29be6d6 100644 --- a/kiauh/core/menus/install_menu.py +++ b/kiauh/core/menus/install_menu.py @@ -13,9 +13,9 @@ import textwrap from kiauh.core.menus import BACK_FOOTER from kiauh.core.menus.base_menu import BaseMenu -from kiauh.modules.klipper import klipper_setup -from kiauh.modules.mainsail import mainsail_setup -from kiauh.modules.moonraker import moonraker_setup +from kiauh.components.klipper import klipper_setup +from kiauh.components.mainsail import mainsail_setup +from kiauh.components.moonraker import moonraker_setup from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT diff --git a/kiauh/core/menus/main_menu.py b/kiauh/core/menus/main_menu.py index 68e964e..0464412 100644 --- a/kiauh/core/menus/main_menu.py +++ b/kiauh/core/menus/main_menu.py @@ -18,10 +18,10 @@ from kiauh.core.menus.install_menu import InstallMenu from kiauh.core.menus.remove_menu import RemoveMenu from kiauh.core.menus.settings_menu import SettingsMenu from kiauh.core.menus.update_menu import UpdateMenu -from kiauh.modules.klipper.klipper_utils import get_klipper_status -from kiauh.modules.log_uploads.menus.log_upload_menu import LogUploadMenu -from kiauh.modules.mainsail.mainsail_utils import get_mainsail_status -from kiauh.modules.moonraker.moonraker_utils import get_moonraker_status +from kiauh.components.klipper.klipper_utils import get_klipper_status +from kiauh.components.log_uploads.menus.log_upload_menu import LogUploadMenu +from kiauh.components.mainsail.mainsail_utils import get_mainsail_status +from kiauh.components.moonraker.moonraker_utils import get_moonraker_status from kiauh.utils.constants import ( COLOR_MAGENTA, COLOR_CYAN, diff --git a/kiauh/core/menus/remove_menu.py b/kiauh/core/menus/remove_menu.py index e8ddd79..ce9c3a2 100644 --- a/kiauh/core/menus/remove_menu.py +++ b/kiauh/core/menus/remove_menu.py @@ -13,9 +13,9 @@ import textwrap from kiauh.core.menus import BACK_FOOTER from kiauh.core.menus.base_menu import BaseMenu -from kiauh.modules.klipper.menus.klipper_remove_menu import KlipperRemoveMenu -from kiauh.modules.mainsail.menus.mainsail_remove_menu import MainsailRemoveMenu -from kiauh.modules.moonraker.menus.moonraker_remove_menu import MoonrakerRemoveMenu +from kiauh.components.klipper.menus.klipper_remove_menu import KlipperRemoveMenu +from kiauh.components.mainsail.menus.mainsail_remove_menu import MainsailRemoveMenu +from kiauh.components.moonraker.menus.moonraker_remove_menu import MoonrakerRemoveMenu from kiauh.utils.constants import COLOR_RED, RESET_FORMAT diff --git a/kiauh/core/menus/update_menu.py b/kiauh/core/menus/update_menu.py index 5b7c6ef..fef8983 100644 --- a/kiauh/core/menus/update_menu.py +++ b/kiauh/core/menus/update_menu.py @@ -13,17 +13,17 @@ import textwrap from kiauh.core.menus import BACK_FOOTER from kiauh.core.menus.base_menu import BaseMenu -from kiauh.modules.klipper.klipper_setup import update_klipper -from kiauh.modules.klipper.klipper_utils import ( +from kiauh.components.klipper.klipper_setup import update_klipper +from kiauh.components.klipper.klipper_utils import ( get_klipper_status, ) -from kiauh.modules.mainsail.mainsail_setup import update_mainsail -from kiauh.modules.mainsail.mainsail_utils import ( +from kiauh.components.mainsail.mainsail_setup import update_mainsail +from kiauh.components.mainsail.mainsail_utils import ( get_mainsail_local_version, get_mainsail_remote_version, ) -from kiauh.modules.moonraker.moonraker_setup import update_moonraker -from kiauh.modules.moonraker.moonraker_utils import get_moonraker_status +from kiauh.components.moonraker.moonraker_setup import update_moonraker +from kiauh.components.moonraker.moonraker_utils import get_moonraker_status from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_WHITE