jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2025-12-23 07:43:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

refactor(KIAUH): add application root to sys path

Browse Source 
shortens imports and helps with auto imports from IDE

Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2024-02-18 22:30:28 +01:00
parent 573dc7c3c9
commit 2a4fcf3a3a
43 changed files with 215 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kiauh/__init__.py
View File

@@ -9,7 +9,11 @@
# This file may be distributed under the terms of the GNU GPLv3 license #
# ======================================================================= #
import sys
from pathlib import Path
APPLICATION_ROOT = Path(__file__).resolve().parent.parent
KIAUH_CFG = APPLICATION_ROOT.joinpath("kiauh.cfg")
PROJECT_ROOT = Path(__file__).resolve().parent.parent
KIAUH_CFG = PROJECT_ROOT.joinpath("kiauh.cfg")
APPLICATION_ROOT = Path(__file__).resolve().parent
sys.path.append(str(APPLICATION_ROOT))

2
kiauh/components/klipper/__init__.py
View File

@@ -11,7 +11,7 @@
from pathlib import Path
from kiauh.core.backup_manager import BACKUP_ROOT_DIR
from core.backup_manager import BACKUP_ROOT_DIR
MODULE_PATH = Path(__file__).resolve().parent

8
kiauh/components/klipper/klipper.py
View File

@@ -13,10 +13,10 @@ import subprocess
from pathlib import Path
from typing import List
from kiauh.components.klipper import KLIPPER_DIR, KLIPPER_ENV_DIR, MODULE_PATH
from kiauh.core.instance_manager.base_instance import BaseInstance
from kiauh.utils.constants import SYSTEMD
from kiauh.utils.logger import Logger
from components.klipper import KLIPPER_DIR, KLIPPER_ENV_DIR, MODULE_PATH
from core.instance_manager.base_instance import BaseInstance
from utils.constants import SYSTEMD
from utils.logger import Logger
# noinspection PyMethodMayBeStatic

6
kiauh/components/klipper/klipper_dialogs.py
View File

@@ -12,9 +12,9 @@
import textwrap
from typing import List
from kiauh.core.instance_manager.base_instance import BaseInstance
from kiauh.core.menus.base_menu import print_back_footer
from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN
from core.instance_manager.base_instance import BaseInstance
from core.menus.base_menu import print_back_footer
from utils.constants import COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN
def print_instance_overview(

14
kiauh/components/klipper/klipper_remove.py
View File

@@ -12,13 +12,13 @@
import shutil
from typing import List, Union
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.core.instance_manager.instance_manager import InstanceManager
from kiauh.utils.filesystem_utils import remove_file
from kiauh.utils.input_utils import get_selection_input
from kiauh.utils.logger import Logger
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.input_utils import get_selection_input
from utils.logger import Logger
def run_klipper_removal(

22
kiauh/components/klipper/klipper_setup.py
View File

@@ -12,16 +12,16 @@
from pathlib import Path
from kiauh import KIAUH_CFG
from kiauh.components.klipper import (
from components.klipper import (
EXIT_KLIPPER_SETUP,
DEFAULT_KLIPPER_REPO_URL,
KLIPPER_DIR,
KLIPPER_ENV_DIR,
KLIPPER_REQUIREMENTS_TXT,
)
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 (
from components.klipper.klipper import Klipper
from components.klipper.klipper_dialogs import print_update_warn_dialog
from components.klipper.klipper_utils import (
handle_disruptive_system_packages,
check_user_groups,
handle_to_multi_instance_conversion,
@@ -34,13 +34,13 @@ from kiauh.components.klipper.klipper_utils import (
handle_instance_naming,
backup_klipper_dir,
)
from kiauh.components.moonraker.moonraker import Moonraker
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.utils.input_utils import get_confirm
from kiauh.utils.logger import Logger
from kiauh.utils.system_utils import (
from components.moonraker.moonraker import Moonraker
from core.config_manager.config_manager import ConfigManager
from core.instance_manager.instance_manager import InstanceManager
from core.repo_manager.repo_manager import RepoManager
from utils.input_utils import get_confirm
from utils.logger import Logger
from utils.system_utils import (
parse_packages_from_file,
create_python_venv,
install_python_requirements,

32
kiauh/components/klipper/klipper_utils.py
View File

@@ -18,32 +18,32 @@ import textwrap
from pathlib import Path
from typing import List, Union, Literal, Dict
from kiauh.components.klipper import (
from components.klipper import (
MODULE_PATH,
KLIPPER_DIR,
KLIPPER_ENV_DIR,
KLIPPER_BACKUP_DIR,
)
from kiauh.components.klipper.klipper import Klipper
from kiauh.components.klipper.klipper_dialogs import (
from components.klipper.klipper import Klipper
from components.klipper.klipper_dialogs import (
print_missing_usergroup_dialog,
print_instance_overview,
print_select_instance_count_dialog,
print_select_custom_name_dialog,
)
from kiauh.components.moonraker.moonraker import Moonraker
from kiauh.components.moonraker.moonraker_utils import moonraker_to_multi_conversion
from kiauh.core.backup_manager.backup_manager import BackupManager
from kiauh.core.config_manager.config_manager import ConfigManager
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.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
from kiauh.utils.logger import Logger
from kiauh.utils.system_utils import mask_system_service
from components.moonraker.moonraker import Moonraker
from components.moonraker.moonraker_utils import moonraker_to_multi_conversion
from core.backup_manager.backup_manager import BackupManager
from core.config_manager.config_manager import ConfigManager
from core.instance_manager.base_instance import BaseInstance
from core.instance_manager.instance_manager import InstanceManager
from core.instance_manager.name_scheme import NameScheme
from core.repo_manager.repo_manager import RepoManager
from utils.common import get_install_status_common
from utils.constants import CURRENT_USER
from utils.input_utils import get_confirm, get_string_input, get_number_input
from utils.logger import Logger
from utils.system_utils import mask_system_service
def get_klipper_status() -> Dict[

8
kiauh/components/klipper/menus/klipper_remove_menu.py
View File

@@ -11,10 +11,10 @@
import textwrap
from kiauh.components.klipper import klipper_remove
from kiauh.core.menus import BACK_HELP_FOOTER
from kiauh.core.menus.base_menu import BaseMenu
from kiauh.utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN
from components.klipper import klipper_remove
from core.menus import BACK_HELP_FOOTER
from core.menus.base_menu import BaseMenu
from utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN
# noinspection PyUnusedLocal

8
kiauh/components/log_uploads/log_upload_utils.py
View File

@@ -13,10 +13,10 @@ import urllib.request
from pathlib import Path
from typing import List
from kiauh.components.klipper.klipper import Klipper
from kiauh.components.log_uploads import LogFile
from kiauh.core.instance_manager.instance_manager import InstanceManager
from kiauh.utils.logger import Logger
from components.klipper.klipper import Klipper
from components.log_uploads import LogFile
from core.instance_manager.instance_manager import InstanceManager
from utils.logger import Logger
def get_logfile_list() -> List[LogFile]:

10
kiauh/components/log_uploads/menus/log_upload_menu.py
View File

@@ -11,11 +11,11 @@
import textwrap
from kiauh.components.log_uploads.log_upload_utils import get_logfile_list
from kiauh.components.log_uploads.log_upload_utils import upload_logfile
from kiauh.core.menus import BACK_FOOTER
from kiauh.core.menus.base_menu import BaseMenu
from kiauh.utils.constants import RESET_FORMAT, COLOR_YELLOW
from components.log_uploads.log_upload_utils import get_logfile_list
from components.log_uploads.log_upload_utils import upload_logfile
from core.menus import BACK_FOOTER
from core.menus.base_menu import BaseMenu
from utils.constants import RESET_FORMAT, COLOR_YELLOW
# noinspection PyMethodMayBeStatic

2
kiauh/components/mainsail/__init__.py
View File

@@ -11,7 +11,7 @@
from pathlib import Path
from kiauh.core.backup_manager import BACKUP_ROOT_DIR
from core.backup_manager import BACKUP_ROOT_DIR
MODULE_PATH = Path(__file__).resolve().parent
MAINSAIL_DIR = Path.home().joinpath("mainsail")

4
kiauh/components/mainsail/mainsail_dialogs.py
View File

@@ -11,8 +11,8 @@
import textwrap
from kiauh.core.menus.base_menu import print_back_footer
from kiauh.utils.constants import RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN
from core.menus.base_menu import print_back_footer
from utils.constants import RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN
def print_moonraker_not_found_dialog():

18
kiauh/components/mainsail/mainsail_remove.py
View File

@@ -15,15 +15,15 @@ import subprocess
from pathlib import Path
from typing import List
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.core.config_manager.config_manager import ConfigManager
from kiauh.core.instance_manager.instance_manager import InstanceManager
from kiauh.utils import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED
from kiauh.utils.filesystem_utils import remove_file
from kiauh.utils.logger import Logger
from components.klipper.klipper import Klipper
from components.mainsail import MAINSAIL_DIR, MAINSAIL_CONFIG_DIR
from components.mainsail.mainsail_utils import backup_config_json
from components.moonraker.moonraker import Moonraker
from core.config_manager.config_manager import ConfigManager
from core.instance_manager.instance_manager import InstanceManager
from utils import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED
from utils.filesystem_utils import remove_file
from utils.logger import Logger
def run_mainsail_removal(

28
kiauh/components/mainsail/mainsail_setup.py
View File

@@ -14,33 +14,33 @@ from pathlib import Path
from typing import List
from kiauh import KIAUH_CFG
from kiauh.components.klipper.klipper import Klipper
from kiauh.components.mainsail import (
from components.klipper.klipper import Klipper
from components.mainsail import (
MAINSAIL_URL,
MAINSAIL_DIR,
MAINSAIL_CONFIG_DIR,
MAINSAIL_CONFIG_REPO_URL,
MODULE_PATH,
)
from kiauh.components.mainsail.mainsail_dialogs import (
from 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.components.mainsail.mainsail_utils import (
from components.mainsail.mainsail_utils import (
restore_config_json,
enable_mainsail_remotemode,
backup_config_json,
symlink_webui_nginx_log,
)
from kiauh.components.moonraker.moonraker import Moonraker
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.utils import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED
from kiauh.utils.common import check_install_dependencies
from kiauh.utils.filesystem_utils import (
from components.moonraker.moonraker import Moonraker
from core.config_manager.config_manager import ConfigManager
from core.instance_manager.instance_manager import InstanceManager
from core.repo_manager.repo_manager import RepoManager
from utils import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED
from utils.common import check_install_dependencies
from utils.filesystem_utils import (
unzip,
copy_upstream_nginx_cfg,
copy_common_vars_nginx_cfg,
@@ -48,9 +48,9 @@ from kiauh.utils.filesystem_utils import (
create_symlink,
remove_file,
)
from kiauh.utils.input_utils import get_confirm, get_number_input
from kiauh.utils.logger import Logger
from kiauh.utils.system_utils import (
from utils.input_utils import get_confirm, get_number_input
from utils.logger import Logger
from utils.system_utils import (
download_file,
set_nginx_permissions,
get_ipv4_addr,

12
kiauh/components/mainsail/mainsail_utils.py
View File

@@ -17,16 +17,16 @@ from typing import List
import urllib.request
from kiauh.components.klipper.klipper import Klipper
from kiauh.components.mainsail import (
from components.klipper.klipper import Klipper
from components.mainsail import (
MAINSAIL_CONFIG_JSON,
MAINSAIL_DIR,
MAINSAIL_BACKUP_DIR,
)
from kiauh.core.backup_manager.backup_manager import BackupManager
from kiauh.utils import NGINX_SITES_AVAILABLE, NGINX_CONFD
from kiauh.utils.common import get_install_status_webui
from kiauh.utils.logger import Logger
from core.backup_manager.backup_manager import BackupManager
from utils import NGINX_SITES_AVAILABLE, NGINX_CONFD
from utils.common import get_install_status_webui
from utils.logger import Logger
def get_mainsail_status() -> str:

8
kiauh/components/mainsail/menus/mainsail_remove_menu.py
View File

@@ -11,10 +11,10 @@
import textwrap
from kiauh.components.mainsail import mainsail_remove
from kiauh.core.menus import BACK_HELP_FOOTER
from kiauh.core.menus.base_menu import BaseMenu
from kiauh.utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN
from components.mainsail import mainsail_remove
from core.menus import BACK_HELP_FOOTER
from core.menus.base_menu import BaseMenu
from utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN
# noinspection PyUnusedLocal

2
kiauh/components/moonraker/__init__.py
View File

@@ -11,7 +11,7 @@
from pathlib import Path
from kiauh.core.backup_manager import BACKUP_ROOT_DIR
from core.backup_manager import BACKUP_ROOT_DIR
MODULE_PATH = Path(__file__).resolve().parent

8
kiauh/components/moonraker/menus/moonraker_remove_menu.py
View File

@@ -11,10 +11,10 @@
import textwrap
from kiauh.components.moonraker import moonraker_remove
from kiauh.core.menus import BACK_HELP_FOOTER
from kiauh.core.menus.base_menu import BaseMenu
from kiauh.utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN
from components.moonraker import moonraker_remove
from core.menus import BACK_HELP_FOOTER
from core.menus.base_menu import BaseMenu
from utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN
# noinspection PyUnusedLocal

10
kiauh/components/moonraker/moonraker.py
View File

@@ -13,11 +13,11 @@ import subprocess
from pathlib import Path
from typing import List, Union
from kiauh.components.moonraker import MOONRAKER_DIR, MOONRAKER_ENV_DIR, MODULE_PATH
from kiauh.core.config_manager.config_manager import ConfigManager
from kiauh.core.instance_manager.base_instance import BaseInstance
from kiauh.utils.constants import SYSTEMD
from kiauh.utils.logger import Logger
from components.moonraker import MOONRAKER_DIR, MOONRAKER_ENV_DIR, MODULE_PATH
from core.config_manager.config_manager import ConfigManager
from core.instance_manager.base_instance import BaseInstance
from utils.constants import SYSTEMD
from utils.logger import Logger
# noinspection PyMethodMayBeStatic

8
kiauh/components/moonraker/moonraker_dialogs.py
View File

@@ -12,10 +12,10 @@
import textwrap
from typing import List
from kiauh.components.klipper.klipper import Klipper
from kiauh.components.moonraker.moonraker import Moonraker
from kiauh.core.menus.base_menu import print_back_footer
from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN
from components.klipper.klipper import Klipper
from components.moonraker.moonraker import Moonraker
from core.menus.base_menu import print_back_footer
from utils.constants import COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN
def print_moonraker_overview(

14
kiauh/components/moonraker/moonraker_remove.py
View File

@@ -13,13 +13,13 @@ import shutil
import subprocess
from typing import List, Union
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.core.instance_manager.instance_manager import InstanceManager
from kiauh.utils.filesystem_utils import remove_file
from kiauh.utils.input_utils import get_selection_input
from kiauh.utils.logger import Logger
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.input_utils import get_selection_input
from utils.logger import Logger
def run_moonraker_removal(

30
kiauh/components/moonraker/moonraker_setup.py
View File

@@ -15,11 +15,11 @@ from pathlib import Path
from typing import List
from kiauh import KIAUH_CFG
from kiauh.components.klipper.klipper import Klipper
from kiauh.components.klipper.klipper_dialogs import print_instance_overview
from kiauh.components.mainsail import MAINSAIL_DIR
from kiauh.components.mainsail.mainsail_utils import enable_mainsail_remotemode
from kiauh.components.moonraker import (
from components.klipper.klipper import Klipper
from components.klipper.klipper_dialogs import print_instance_overview
from components.mainsail import MAINSAIL_DIR
from components.mainsail.mainsail_utils import enable_mainsail_remotemode
from components.moonraker import (
EXIT_MOONRAKER_SETUP,
DEFAULT_MOONRAKER_REPO_URL,
MOONRAKER_DIR,
@@ -30,22 +30,22 @@ from kiauh.components.moonraker import (
POLKIT_USR_FILE,
POLKIT_SCRIPT,
)
from kiauh.components.moonraker.moonraker import Moonraker
from kiauh.components.moonraker.moonraker_dialogs import print_moonraker_overview
from kiauh.components.moonraker.moonraker_utils import (
from components.moonraker.moonraker import Moonraker
from components.moonraker.moonraker_dialogs import print_moonraker_overview
from components.moonraker.moonraker_utils import (
create_example_moonraker_conf,
backup_moonraker_dir,
)
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.utils.filesystem_utils import check_file_exist
from kiauh.utils.input_utils import (
from core.config_manager.config_manager import ConfigManager
from core.instance_manager.instance_manager import InstanceManager
from core.repo_manager.repo_manager import RepoManager
from utils.filesystem_utils import check_file_exist
from utils.input_utils import (
get_confirm,
get_selection_input,
)
from kiauh.utils.logger import Logger
from kiauh.utils.system_utils import (
from utils.logger import Logger
from utils.system_utils import (
parse_packages_from_file,
create_python_venv,
install_python_requirements,

22
kiauh/components/moonraker/moonraker_utils.py
View File

@@ -12,9 +12,9 @@
import shutil
from typing import Dict, Literal, List, Union
from kiauh.components.mainsail import MAINSAIL_DIR
from kiauh.components.mainsail.mainsail_utils import enable_mainsail_remotemode
from kiauh.components.moonraker import (
from components.mainsail import MAINSAIL_DIR
from components.mainsail.mainsail_utils import enable_mainsail_remotemode
from components.moonraker import (
DEFAULT_MOONRAKER_PORT,
MODULE_PATH,
MOONRAKER_DIR,
@@ -22,14 +22,14 @@ from kiauh.components.moonraker import (
MOONRAKER_BACKUP_DIR,
MOONRAKER_DB_BACKUP_DIR,
)
from kiauh.components.moonraker.moonraker import Moonraker
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.core.repo_manager.repo_manager import RepoManager
from kiauh.utils.common import get_install_status_common
from kiauh.utils.logger import Logger
from kiauh.utils.system_utils import (
from components.moonraker.moonraker import Moonraker
from core.backup_manager.backup_manager import BackupManager
from core.config_manager.config_manager import ConfigManager
from core.instance_manager.instance_manager import InstanceManager
from core.repo_manager.repo_manager import RepoManager
from utils.common import get_install_status_common
from utils.logger import Logger
from utils.system_utils import (
get_ipv4_addr,
)

6
kiauh/core/backup_manager/backup_manager.py
View File

@@ -13,9 +13,9 @@ import shutil
from pathlib import Path
from typing import List
from kiauh.core.backup_manager import BACKUP_ROOT_DIR
from kiauh.utils.common import get_current_date
from kiauh.utils.logger import Logger
from core.backup_manager import BACKUP_ROOT_DIR
from utils.common import get_current_date
from utils.logger import Logger
# noinspection PyUnusedLocal

2
kiauh/core/config_manager/config_manager.py
View File

@@ -13,7 +13,7 @@ import configparser
from pathlib import Path
from typing import Union
from kiauh.utils.logger import Logger
from utils.logger import Logger
# noinspection PyMethodMayBeStatic

2
kiauh/core/instance_manager/base_instance.py
View File

@@ -13,7 +13,7 @@ from abc import abstractmethod, ABC
from pathlib import Path
from typing import List, Type, TypeVar
from kiauh.utils.constants import SYSTEMD, CURRENT_USER
from utils.constants import SYSTEMD, CURRENT_USER
B = TypeVar(name="B", bound="BaseInstance", covariant=True)

6
kiauh/core/instance_manager/instance_manager.py
View File

@@ -14,9 +14,9 @@ import subprocess
from pathlib import Path
from typing import List, Optional, Union, TypeVar
from kiauh.core.instance_manager.base_instance import BaseInstance
from kiauh.utils.constants import SYSTEMD
from kiauh.utils.logger import Logger
from core.instance_manager.base_instance import BaseInstance
from utils.constants import SYSTEMD
from utils.logger import Logger
I = TypeVar(name="I", bound=BaseInstance, covariant=True)

6
kiauh/core/menus/advanced_menu.py
View File

@@ -11,9 +11,9 @@
import textwrap
from kiauh.core.menus import BACK_FOOTER
from kiauh.core.menus.base_menu import BaseMenu
from kiauh.utils.constants import COLOR_YELLOW, RESET_FORMAT
from core.menus import BACK_FOOTER
from core.menus.base_menu import BaseMenu
from utils.constants import COLOR_YELLOW, RESET_FORMAT
class AdvancedMenu(BaseMenu):

14
kiauh/core/menus/backup_menu.py
View File

@@ -11,16 +11,16 @@
import textwrap
from kiauh.components.klipper.klipper_utils import backup_klipper_dir
from kiauh.components.mainsail.mainsail_utils import backup_mainsail_data
from kiauh.components.moonraker.moonraker_utils import (
from components.klipper.klipper_utils import backup_klipper_dir
from components.mainsail.mainsail_utils import backup_mainsail_data
from components.moonraker.moonraker_utils import (
backup_moonraker_dir,
backup_moonraker_db_dir,
)
from kiauh.core.menus import BACK_FOOTER
from kiauh.core.menus.base_menu import BaseMenu
from kiauh.utils.common import backup_printer_config_dir
from kiauh.utils.constants import COLOR_CYAN, RESET_FORMAT, COLOR_YELLOW
from core.menus import BACK_FOOTER
from core.menus.base_menu import BaseMenu
from utils.common import backup_printer_config_dir
from utils.constants import COLOR_CYAN, RESET_FORMAT, COLOR_YELLOW
# noinspection PyUnusedLocal

6
kiauh/core/menus/base_menu.py
View File

@@ -15,15 +15,15 @@ import textwrap
from abc import abstractmethod, ABC
from typing import Dict, Any, Literal, Union, Callable
from kiauh.core.menus import QUIT_FOOTER, BACK_FOOTER, BACK_HELP_FOOTER
from kiauh.utils.constants import (
from core.menus import QUIT_FOOTER, BACK_FOOTER, BACK_HELP_FOOTER
from utils.constants import (
COLOR_GREEN,
COLOR_YELLOW,
COLOR_RED,
COLOR_CYAN,
RESET_FORMAT,
)
from kiauh.utils.logger import Logger
from utils.logger import Logger
def clear():

8
kiauh/core/menus/extensions_menu.py
View File

@@ -16,10 +16,10 @@ import textwrap
from pathlib import Path
from typing import List, Dict
from kiauh.core.base_extension import BaseExtension
from kiauh.core.menus import BACK_FOOTER
from kiauh.core.menus.base_menu import BaseMenu
from kiauh.utils.constants import RESET_FORMAT, COLOR_CYAN, COLOR_YELLOW
from core.base_extension import BaseExtension
from core.menus import BACK_FOOTER
from core.menus.base_menu import BaseMenu
from utils.constants import RESET_FORMAT, COLOR_CYAN, COLOR_YELLOW
# noinspection PyUnusedLocal

13
kiauh/core/menus/install_menu.py
View File

@@ -11,12 +11,13 @@
import textwrap
from kiauh.components.klipper import klipper_setup
from kiauh.components.mainsail import mainsail_setup
from kiauh.components.moonraker import moonraker_setup
from kiauh.core.menus import BACK_FOOTER
from kiauh.core.menus.base_menu import BaseMenu
from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT
from components.fluidd import fluidd_setup
from components.klipper import klipper_setup
from components.mainsail import mainsail_setup
from components.moonraker import moonraker_setup
from core.menus import BACK_FOOTER
from core.menus.base_menu import BaseMenu
from utils.constants import COLOR_GREEN, RESET_FORMAT
# noinspection PyUnusedLocal

12
kiauh/core/menus/remove_menu.py
View File

@@ -11,12 +11,12 @@
import textwrap
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.core.menus import BACK_FOOTER
from kiauh.core.menus.base_menu import BaseMenu
from kiauh.utils.constants import COLOR_RED, RESET_FORMAT
from components.klipper.menus.klipper_remove_menu import KlipperRemoveMenu
from components.mainsail.menus.mainsail_remove_menu import MainsailRemoveMenu
from components.moonraker.menus.moonraker_remove_menu import MoonrakerRemoveMenu
from core.menus import BACK_FOOTER
from core.menus.base_menu import BaseMenu
from utils.constants import COLOR_RED, RESET_FORMAT
# noinspection PyUnusedLocal

2
kiauh/core/menus/settings_menu.py
View File

@@ -9,7 +9,7 @@
# This file may be distributed under the terms of the GNU GPLv3 license #
# ======================================================================= #
from kiauh.core.menus.base_menu import BaseMenu
from core.menus.base_menu import BaseMenu
# noinspection PyMethodMayBeStatic

4
kiauh/core/repo_manager/repo_manager.py
View File

@@ -13,8 +13,8 @@ import shutil
import subprocess
from pathlib import Path
from kiauh.utils.input_utils import get_confirm
from kiauh.utils.logger import Logger
from utils.input_utils import get_confirm
from utils.logger import Logger
# noinspection PyMethodMayBeStatic

18
kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py
View File

@@ -13,21 +13,21 @@ import os
import shutil
from typing import List
from kiauh.components.klipper.klipper import Klipper
from kiauh.core.backup_manager.backup_manager import BackupManager
from kiauh.core.base_extension import BaseExtension
from kiauh.core.config_manager.config_manager import ConfigManager
from kiauh.core.instance_manager.instance_manager import InstanceManager
from kiauh.extensions.gcode_shell_cmd import (
from components.klipper.klipper import Klipper
from core.backup_manager.backup_manager import BackupManager
from core.base_extension import BaseExtension
from core.config_manager.config_manager import ConfigManager
from core.instance_manager.instance_manager import InstanceManager
from extensions.gcode_shell_cmd import (
EXTENSION_TARGET_PATH,
EXTENSION_SRC,
KLIPPER_DIR,
EXAMPLE_CFG_SRC,
KLIPPER_EXTRAS,
)
from kiauh.utils.filesystem_utils import check_file_exist
from kiauh.utils.input_utils import get_confirm
from kiauh.utils.logger import Logger
from utils.filesystem_utils import check_file_exist
from utils.input_utils import get_confirm
from utils.logger import Logger
# noinspection PyMethodMayBeStatic

4
kiauh/main.py
View File

@@ -9,8 +9,8 @@
# This file may be distributed under the terms of the GNU GPLv3 license #
# ======================================================================= #
from kiauh.core.menus.main_menu import MainMenu
from kiauh.utils.logger import Logger
from core.menus.main_menu import MainMenu
from utils.logger import Logger
def main():

2
kiauh/utils/__init__.py
View File

@@ -11,7 +11,7 @@
from pathlib import Path
from kiauh.core.backup_manager import BACKUP_ROOT_DIR
from core.backup_manager import BACKUP_ROOT_DIR
MODULE_PATH = Path(__file__).resolve().parent
INVALID_CHOICE = "Invalid choice. Please select a valid value."

18
kiauh/utils/common.py
View File

@@ -13,20 +13,20 @@ from datetime import datetime
from pathlib import Path
from typing import Dict, Literal, List, Type, Union
from kiauh.components.klipper.klipper import Klipper
from kiauh.core.instance_manager.base_instance import BaseInstance
from kiauh.core.instance_manager.instance_manager import InstanceManager
from kiauh.utils import PRINTER_CFG_BACKUP_DIR
from kiauh.utils.constants import (
from components.klipper.klipper import Klipper
from core.instance_manager.base_instance import BaseInstance
from core.instance_manager.instance_manager import InstanceManager
from utils import PRINTER_CFG_BACKUP_DIR
from utils.constants import (
COLOR_CYAN,
RESET_FORMAT,
COLOR_YELLOW,
COLOR_GREEN,
COLOR_RED,
)
from kiauh.utils.filesystem_utils import check_file_exist
from kiauh.utils.logger import Logger
from kiauh.utils.system_utils import check_package_install, install_system_packages
from utils.filesystem_utils import check_file_exist
from utils.logger import Logger
from utils.system_utils import check_package_install, install_system_packages
def get_current_date() -> Dict[Literal["date", "time"], str]:
@@ -122,7 +122,7 @@ def get_install_status_webui(
def backup_printer_config_dir():
# local import to prevent circular import
from kiauh.core.backup_manager.backup_manager import BackupManager
from core.backup_manager.backup_manager import BackupManager
im = InstanceManager(Klipper)
instances: List[Klipper] = im.instances

4
kiauh/utils/filesystem_utils.py
View File

@@ -13,12 +13,12 @@ import subprocess
from pathlib import Path
from zipfile import ZipFile
from kiauh.utils import (
from utils import (
NGINX_SITES_AVAILABLE,
MODULE_PATH,
NGINX_CONFD,
)
from kiauh.utils.logger import Logger
from utils.logger import Logger
def check_file_exist(file_path: Path, sudo=False) -> bool:

6
kiauh/utils/input_utils.py
View File

@@ -11,9 +11,9 @@
from typing import Optional, List, Union
from kiauh.utils import INVALID_CHOICE
from kiauh.utils.constants import COLOR_CYAN, RESET_FORMAT
from kiauh.utils.logger import Logger
from utils import INVALID_CHOICE
from utils.constants import COLOR_CYAN, RESET_FORMAT
from utils.logger import Logger
def get_confirm(

2
kiauh/utils/logger.py
View File

@@ -9,7 +9,7 @@
# This file may be distributed under the terms of the GNU GPLv3 license #
# ======================================================================= #
from kiauh.utils.constants import (
from utils.constants import (
COLOR_WHITE,
COLOR_GREEN,
COLOR_YELLOW,

6
kiauh/utils/system_utils.py
View File

@@ -21,9 +21,9 @@ import venv
from pathlib import Path
from typing import List, Literal
from kiauh.utils.input_utils import get_confirm
from kiauh.utils.logger import Logger
from kiauh.utils.filesystem_utils import check_file_exist
from utils.input_utils import get_confirm
from utils.logger import Logger
from utils.filesystem_utils import check_file_exist
def kill(opt_err_msg: str = "") -> None: