diff --git a/kiauh/components/crowsnest/crowsnest.py b/kiauh/components/crowsnest/crowsnest.py index ee1c428..68d9fcc 100644 --- a/kiauh/components/crowsnest/crowsnest.py +++ b/kiauh/components/crowsnest/crowsnest.py @@ -28,7 +28,7 @@ from utils.git_utils import ( ) from utils.input_utils import get_confirm from utils.logger import Logger -from utils.system_utils import ( +from utils.sys_utils import ( check_package_install, install_system_packages, parse_packages_from_file, diff --git a/kiauh/components/klipper/klipper_remove.py b/kiauh/components/klipper/klipper_remove.py index 2c30e30..ad5f30b 100644 --- a/kiauh/components/klipper/klipper_remove.py +++ b/kiauh/components/klipper/klipper_remove.py @@ -14,7 +14,7 @@ from components.klipper import KLIPPER_DIR, KLIPPER_ENV_DIR from components.klipper.klipper import Klipper from components.klipper.klipper_dialogs import print_instance_overview from core.instance_manager.instance_manager import InstanceManager -from utils.filesystem_utils import remove_file +from utils.fs_utils import remove_file from utils.input_utils import get_selection_input from utils.logger import Logger diff --git a/kiauh/components/klipper/klipper_setup.py b/kiauh/components/klipper/klipper_setup.py index 32f1be6..bcf0634 100644 --- a/kiauh/components/klipper/klipper_setup.py +++ b/kiauh/components/klipper/klipper_setup.py @@ -39,7 +39,7 @@ from core.instance_manager.instance_manager import InstanceManager from utils.git_utils import git_clone_wrapper, git_pull_wrapper from utils.input_utils import get_confirm from utils.logger import Logger -from utils.system_utils import ( +from utils.sys_utils import ( parse_packages_from_file, create_python_venv, install_python_requirements, diff --git a/kiauh/components/klipper/klipper_utils.py b/kiauh/components/klipper/klipper_utils.py index 75a3df0..a16fdb0 100644 --- a/kiauh/components/klipper/klipper_utils.py +++ b/kiauh/components/klipper/klipper_utils.py @@ -45,7 +45,7 @@ from utils.constants import CURRENT_USER from utils.git_utils import get_repo_name, get_remote_commit, get_local_commit from utils.input_utils import get_confirm, get_string_input, get_number_input from utils.logger import Logger -from utils.system_utils import control_systemd_service +from utils.sys_utils import control_systemd_service def get_klipper_status() -> ( diff --git a/kiauh/components/klipper_firmware/firmware_utils.py b/kiauh/components/klipper_firmware/firmware_utils.py index c8210e1..b2d33d1 100644 --- a/kiauh/components/klipper_firmware/firmware_utils.py +++ b/kiauh/components/klipper_firmware/firmware_utils.py @@ -19,7 +19,7 @@ from components.klipper_firmware.flash_options import ( ) from core.instance_manager.instance_manager import InstanceManager from utils.logger import Logger -from utils.system_utils import log_process +from utils.sys_utils import log_process def find_firmware_file() -> bool: diff --git a/kiauh/components/klipper_firmware/menus/klipper_build_menu.py b/kiauh/components/klipper_firmware/menus/klipper_build_menu.py index 4bba6f4..b747778 100644 --- a/kiauh/components/klipper_firmware/menus/klipper_build_menu.py +++ b/kiauh/components/klipper_firmware/menus/klipper_build_menu.py @@ -20,7 +20,7 @@ from core.menus import Option from core.menus.base_menu import BaseMenu from utils.constants import COLOR_CYAN, RESET_FORMAT, COLOR_GREEN, COLOR_RED from utils.logger import Logger -from utils.system_utils import ( +from utils.sys_utils import ( check_package_install, update_system_package_lists, install_system_packages, diff --git a/kiauh/components/moonraker/moonraker_remove.py b/kiauh/components/moonraker/moonraker_remove.py index dde6c0e..8a64ca0 100644 --- a/kiauh/components/moonraker/moonraker_remove.py +++ b/kiauh/components/moonraker/moonraker_remove.py @@ -15,7 +15,7 @@ from components.klipper.klipper_dialogs import print_instance_overview from components.moonraker import MOONRAKER_DIR, MOONRAKER_ENV_DIR from components.moonraker.moonraker import Moonraker from core.instance_manager.instance_manager import InstanceManager -from utils.filesystem_utils import remove_file +from utils.fs_utils import remove_file from utils.input_utils import get_selection_input from utils.logger import Logger diff --git a/kiauh/components/moonraker/moonraker_setup.py b/kiauh/components/moonraker/moonraker_setup.py index 8af405c..d186b5c 100644 --- a/kiauh/components/moonraker/moonraker_setup.py +++ b/kiauh/components/moonraker/moonraker_setup.py @@ -35,14 +35,14 @@ from components.moonraker.moonraker_utils import ( backup_moonraker_dir, ) from core.instance_manager.instance_manager import InstanceManager -from utils.filesystem_utils import check_file_exist +from utils.fs_utils import check_file_exist from utils.git_utils import git_clone_wrapper, git_pull_wrapper from utils.input_utils import ( get_confirm, get_selection_input, ) from utils.logger import Logger -from utils.system_utils import ( +from utils.sys_utils import ( parse_packages_from_file, create_python_venv, install_python_requirements, diff --git a/kiauh/components/moonraker/moonraker_utils.py b/kiauh/components/moonraker/moonraker_utils.py index 8014420..966d58a 100644 --- a/kiauh/components/moonraker/moonraker_utils.py +++ b/kiauh/components/moonraker/moonraker_utils.py @@ -28,7 +28,7 @@ from core.instance_manager.instance_manager import InstanceManager from utils.common import get_install_status_common from utils.git_utils import get_repo_name, get_local_commit, get_remote_commit from utils.logger import Logger -from utils.system_utils import ( +from utils.sys_utils import ( get_ipv4_addr, ) diff --git a/kiauh/components/webui_client/client_config/client_config_remove.py b/kiauh/components/webui_client/client_config/client_config_remove.py index 3e1dffd..cf8add7 100644 --- a/kiauh/components/webui_client/client_config/client_config_remove.py +++ b/kiauh/components/webui_client/client_config/client_config_remove.py @@ -17,7 +17,7 @@ from components.moonraker.moonraker import Moonraker from components.webui_client.base_data import BaseWebClientConfig from core.instance_manager.instance_manager import InstanceManager from utils.config_utils import remove_config_section -from utils.filesystem_utils import remove_file +from utils.fs_utils import remove_file from utils.logger import Logger diff --git a/kiauh/components/webui_client/client_config/client_config_setup.py b/kiauh/components/webui_client/client_config/client_config_setup.py index 8b01c48..f6a2be1 100644 --- a/kiauh/components/webui_client/client_config/client_config_setup.py +++ b/kiauh/components/webui_client/client_config/client_config_setup.py @@ -27,7 +27,7 @@ from components.webui_client.client_utils import ( from core.instance_manager.instance_manager import InstanceManager from utils.common import backup_printer_config_dir from utils.config_utils import add_config_section, add_config_section_at_top -from utils.filesystem_utils import create_symlink +from utils.fs_utils import create_symlink from utils.git_utils import git_clone_wrapper, git_pull_wrapper from utils.input_utils import get_confirm from utils.logger import Logger diff --git a/kiauh/components/webui_client/client_remove.py b/kiauh/components/webui_client/client_remove.py index b6350f0..a803ffd 100644 --- a/kiauh/components/webui_client/client_remove.py +++ b/kiauh/components/webui_client/client_remove.py @@ -24,7 +24,7 @@ from components.webui_client.client_utils import backup_mainsail_config_json from core.instance_manager.instance_manager import InstanceManager from utils.config_utils import remove_config_section -from utils.filesystem_utils import ( +from utils.fs_utils import ( remove_nginx_config, remove_nginx_logs, ) diff --git a/kiauh/components/webui_client/client_setup.py b/kiauh/components/webui_client/client_setup.py index 0afce0b..123befd 100644 --- a/kiauh/components/webui_client/client_setup.py +++ b/kiauh/components/webui_client/client_setup.py @@ -38,7 +38,7 @@ from core.settings.kiauh_settings import KiauhSettings from utils import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED from utils.common import check_install_dependencies from utils.config_utils import add_config_section -from utils.filesystem_utils import ( +from utils.fs_utils import ( unzip, copy_upstream_nginx_cfg, copy_common_vars_nginx_cfg, @@ -51,7 +51,7 @@ from utils.filesystem_utils import ( ) from utils.input_utils import get_confirm, get_number_input from utils.logger import Logger -from utils.system_utils import ( +from utils.sys_utils import ( download_file, set_nginx_permissions, get_ipv4_addr, diff --git a/kiauh/core/instance_manager/instance_manager.py b/kiauh/core/instance_manager/instance_manager.py index 02df91f..48f80e2 100644 --- a/kiauh/core/instance_manager/instance_manager.py +++ b/kiauh/core/instance_manager/instance_manager.py @@ -15,7 +15,7 @@ from typing import List, Optional, Union, TypeVar from core.instance_manager.base_instance import BaseInstance from utils.constants import SYSTEMD from utils.logger import Logger -from utils.system_utils import control_systemd_service +from utils.sys_utils import control_systemd_service T = TypeVar(name="T", bound=BaseInstance, covariant=True) diff --git a/kiauh/core/settings/kiauh_settings.py b/kiauh/core/settings/kiauh_settings.py index 8eddb12..6547855 100644 --- a/kiauh/core/settings/kiauh_settings.py +++ b/kiauh/core/settings/kiauh_settings.py @@ -15,7 +15,7 @@ from core.config_manager.config_manager import CustomConfigParser from kiauh import PROJECT_ROOT from utils.constants import RESET_FORMAT, COLOR_RED from utils.logger import Logger -from utils.system_utils import kill +from utils.sys_utils import kill # noinspection PyUnusedLocal diff --git a/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py b/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py index a4cc7f7..8e90550 100644 --- a/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py +++ b/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py @@ -23,7 +23,7 @@ from extensions.gcode_shell_cmd import ( EXAMPLE_CFG_SRC, KLIPPER_EXTRAS, ) -from utils.filesystem_utils import check_file_exist +from utils.fs_utils import check_file_exist from utils.input_utils import get_confirm from utils.logger import Logger diff --git a/kiauh/extensions/klipper_backup/klipper_backup_extension.py b/kiauh/extensions/klipper_backup/klipper_backup_extension.py index 2f739cf..6aac38c 100644 --- a/kiauh/extensions/klipper_backup/klipper_backup_extension.py +++ b/kiauh/extensions/klipper_backup/klipper_backup_extension.py @@ -20,7 +20,7 @@ from extensions.klipper_backup import ( MOONRAKER_CONF, ) -from utils.filesystem_utils import check_file_exist +from utils.fs_utils import check_file_exist from utils.input_utils import get_confirm from utils.logger import Logger @@ -167,7 +167,7 @@ class KlipperbackupExtension(BaseExtension): Logger.print_error("Unable to remove the Klipper-Backup cron entry") # Remove Moonraker entry - Logger.print_status(f"Check for Klipper-Backup moonraker entry ...") + Logger.print_status("Check for Klipper-Backup moonraker entry ...") try: if remove_moonraker_entry(): Logger.print_ok("Klipper-Backup entry in moonraker.conf removed") diff --git a/kiauh/utils/common.py b/kiauh/utils/common.py index 307d6a8..c63dc0b 100644 --- a/kiauh/utils/common.py +++ b/kiauh/utils/common.py @@ -22,9 +22,9 @@ from utils.constants import ( COLOR_GREEN, COLOR_RED, ) -from utils.filesystem_utils import check_file_exist +from utils.fs_utils import check_file_exist from utils.logger import Logger -from utils.system_utils import check_package_install, install_system_packages +from utils.sys_utils import check_package_install, install_system_packages def get_current_date() -> Dict[Literal["date", "time"], str]: diff --git a/kiauh/utils/filesystem_utils.py b/kiauh/utils/fs_utils.py similarity index 100% rename from kiauh/utils/filesystem_utils.py rename to kiauh/utils/fs_utils.py diff --git a/kiauh/utils/system_utils.py b/kiauh/utils/sys_utils.py similarity index 99% rename from kiauh/utils/system_utils.py rename to kiauh/utils/sys_utils.py index 69c3a22..80cc569 100644 --- a/kiauh/utils/system_utils.py +++ b/kiauh/utils/sys_utils.py @@ -21,7 +21,7 @@ from typing import List, Literal import select -from utils.filesystem_utils import check_file_exist +from utils.fs_utils import check_file_exist from utils.input_utils import get_confirm from utils.logger import Logger