chore(kiauh): rename "modules" to "components"

Signed-off-by: Dominik Willner <th33xitus@gmail.com>

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
 

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.components.klipper import KLIPPER_DIR, KLIPPER_ENV_DIR
-from kiauh.modules.klipper.klipper import Klipper
+from kiauh.components.klipper.klipper import Klipper
-from kiauh.modules.klipper.klipper_dialogs import print_instance_overview
+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

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.components.klipper.klipper import Klipper
-from kiauh.modules.klipper.klipper_dialogs import print_update_warn_dialog
+from kiauh.components.klipper.klipper_dialogs import print_update_warn_dialog
-from kiauh.modules.klipper.klipper_utils import (
+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 (

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.components.klipper import MODULE_PATH, KLIPPER_DIR, KLIPPER_ENV_DIR
-from kiauh.modules.klipper.klipper import Klipper
+from kiauh.components.klipper.klipper import Klipper
-from kiauh.modules.klipper.klipper_dialogs import (
+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.components.moonraker.moonraker import Moonraker
-from kiauh.modules.moonraker.moonraker_utils import moonraker_to_multi_conversion
+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

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.components.klipper import klipper_remove
-from kiauh.modules.moonraker import moonraker_remove
 from kiauh.utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN
 
 

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.components.klipper.klipper import Klipper
-from kiauh.modules.log_uploads import LogFile
+from kiauh.components.log_uploads import LogFile
 from kiauh.utils.logger import Logger
 
 

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.components.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 get_logfile_list
 from kiauh.utils.constants import RESET_FORMAT, COLOR_YELLOW
 
 

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.components.klipper.klipper import Klipper
-from kiauh.modules.mainsail import MAINSAIL_DIR, MAINSAIL_CONFIG_DIR
+from kiauh.components.mainsail import MAINSAIL_DIR, MAINSAIL_CONFIG_DIR
-from kiauh.modules.mainsail.mainsail_utils import backup_config_json
+from kiauh.components.mainsail.mainsail_utils import backup_config_json
-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.filesystem_utils import remove_file
 from kiauh.utils.logger import Logger

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.components.klipper.klipper import Klipper
-from kiauh.modules.mainsail import (
+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 (

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.components.klipper.klipper import Klipper
-from kiauh.modules.mainsail import MAINSAIL_CONFIG_JSON, MAINSAIL_DIR
+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

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
 
 

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
 
 

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
 

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.components.klipper.klipper import Klipper
-from kiauh.modules.moonraker.moonraker import Moonraker
+from kiauh.components.moonraker.moonraker import Moonraker
 from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN
 
 

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.components.klipper.klipper_dialogs import print_instance_overview
-from kiauh.modules.moonraker import MOONRAKER_DIR, MOONRAKER_ENV_DIR
+from kiauh.components.moonraker import MOONRAKER_DIR, MOONRAKER_ENV_DIR
-from kiauh.modules.moonraker.moonraker import Moonraker
+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

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.components.klipper.klipper import Klipper
-from kiauh.modules.klipper.klipper_dialogs import print_instance_overview
+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.components.mainsail import MAINSAIL_DIR
-from kiauh.modules.mainsail.mainsail_utils import enable_mainsail_remotemode
+from kiauh.components.mainsail.mainsail_utils import enable_mainsail_remotemode
-from kiauh.modules.moonraker import (
+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.components.moonraker.moonraker import Moonraker
-from kiauh.modules.moonraker.moonraker_dialogs import print_moonraker_overview
+from kiauh.components.moonraker.moonraker_dialogs import print_moonraker_overview
-from kiauh.modules.moonraker.moonraker_utils import create_example_moonraker_conf
+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,

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.components.mainsail import MAINSAIL_DIR
-from kiauh.modules.mainsail.mainsail_utils import enable_mainsail_remotemode
+from kiauh.components.mainsail.mainsail_utils import enable_mainsail_remotemode
-from kiauh.modules.moonraker import (
+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 (

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.components.klipper import klipper_setup
-from kiauh.modules.mainsail import mainsail_setup
+from kiauh.components.mainsail import mainsail_setup
-from kiauh.modules.moonraker import moonraker_setup
+from kiauh.components.moonraker import moonraker_setup
 from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT
 
 

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.components.klipper.klipper_utils import get_klipper_status
-from kiauh.modules.log_uploads.menus.log_upload_menu import LogUploadMenu
+from kiauh.components.log_uploads.menus.log_upload_menu import LogUploadMenu
-from kiauh.modules.mainsail.mainsail_utils import get_mainsail_status
+from kiauh.components.mainsail.mainsail_utils import get_mainsail_status
-from kiauh.modules.moonraker.moonraker_utils import get_moonraker_status
+from kiauh.components.moonraker.moonraker_utils import get_moonraker_status
 from kiauh.utils.constants import (
     COLOR_MAGENTA,
     COLOR_CYAN,

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.components.klipper.menus.klipper_remove_menu import KlipperRemoveMenu
-from kiauh.modules.mainsail.menus.mainsail_remove_menu import MainsailRemoveMenu
+from kiauh.components.mainsail.menus.mainsail_remove_menu import MainsailRemoveMenu
-from kiauh.modules.moonraker.menus.moonraker_remove_menu import MoonrakerRemoveMenu
+from kiauh.components.moonraker.menus.moonraker_remove_menu import MoonrakerRemoveMenu
 from kiauh.utils.constants import COLOR_RED, RESET_FORMAT
 
 

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.components.klipper.klipper_setup import update_klipper
-from kiauh.modules.klipper.klipper_utils import (
+from kiauh.components.klipper.klipper_utils import (
     get_klipper_status,
 )
-from kiauh.modules.mainsail.mainsail_setup import update_mainsail
+from kiauh.components.mainsail.mainsail_setup import update_mainsail
-from kiauh.modules.mainsail.mainsail_utils import (
+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.components.moonraker.moonraker_setup import update_moonraker
-from kiauh.modules.moonraker.moonraker_utils import get_moonraker_status
+from kiauh.components.moonraker.moonraker_utils import get_moonraker_status
 from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_WHITE