refactor: rename filesystem_utils to fs_utils and system_utils to sys_utils

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

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,

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
 

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,

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() -> (

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:

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,

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
 

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,

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,
 )
 

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
 
 

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

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,
 )

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,

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)
 

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

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
 

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")

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]:

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