From d0d2404132fcc864bbf0339a946b94b7e1122e49 Mon Sep 17 00:00:00 2001 From: dw-0 Date: Sun, 12 Nov 2023 23:28:05 +0100 Subject: [PATCH] refactor(kiauh): move core modules to core package Signed-off-by: Dominik Willner --- kiauh/{config_manager => core}/__init__.py | 0 .../config_manager}/__init__.py | 0 kiauh/{ => core}/config_manager/config_manager.py | 0 kiauh/{menus => core/instance_manager}/__init__.py | 0 kiauh/{ => core}/instance_manager/base_instance.py | 0 .../{ => core}/instance_manager/instance_manager.py | 2 +- kiauh/{repo_manager => core/menus}/__init__.py | 0 kiauh/{ => core}/menus/advanced_menu.py | 2 +- kiauh/{ => core}/menus/base_menu.py | 0 kiauh/{ => core}/menus/install_menu.py | 2 +- kiauh/{ => core}/menus/main_menu.py | 12 ++++++------ kiauh/{ => core}/menus/remove_menu.py | 2 +- kiauh/{ => core}/menus/settings_menu.py | 2 +- kiauh/{ => core}/menus/update_menu.py | 2 +- kiauh/core/repo_manager/__init__.py | 0 kiauh/{ => core}/repo_manager/repo_manager.py | 0 kiauh/main.py | 2 +- kiauh/modules/klipper/klipper.py | 2 +- kiauh/modules/klipper/klipper_dialogs.py | 4 ++-- kiauh/modules/klipper/klipper_setup.py | 6 +++--- kiauh/modules/klipper/klipper_utils.py | 2 +- 21 files changed, 20 insertions(+), 20 deletions(-) rename kiauh/{config_manager => core}/__init__.py (100%) rename kiauh/{instance_manager => core/config_manager}/__init__.py (100%) rename kiauh/{ => core}/config_manager/config_manager.py (100%) rename kiauh/{menus => core/instance_manager}/__init__.py (100%) rename kiauh/{ => core}/instance_manager/base_instance.py (100%) rename kiauh/{ => core}/instance_manager/instance_manager.py (99%) rename kiauh/{repo_manager => core/menus}/__init__.py (100%) rename kiauh/{ => core}/menus/advanced_menu.py (97%) rename kiauh/{ => core}/menus/base_menu.py (100%) rename kiauh/{ => core}/menus/install_menu.py (98%) rename kiauh/{ => core}/menus/main_menu.py (89%) rename kiauh/{ => core}/menus/remove_menu.py (98%) rename kiauh/{ => core}/menus/settings_menu.py (96%) rename kiauh/{ => core}/menus/update_menu.py (98%) create mode 100644 kiauh/core/repo_manager/__init__.py rename kiauh/{ => core}/repo_manager/repo_manager.py (100%) diff --git a/kiauh/config_manager/__init__.py b/kiauh/core/__init__.py similarity index 100% rename from kiauh/config_manager/__init__.py rename to kiauh/core/__init__.py diff --git a/kiauh/instance_manager/__init__.py b/kiauh/core/config_manager/__init__.py similarity index 100% rename from kiauh/instance_manager/__init__.py rename to kiauh/core/config_manager/__init__.py diff --git a/kiauh/config_manager/config_manager.py b/kiauh/core/config_manager/config_manager.py similarity index 100% rename from kiauh/config_manager/config_manager.py rename to kiauh/core/config_manager/config_manager.py diff --git a/kiauh/menus/__init__.py b/kiauh/core/instance_manager/__init__.py similarity index 100% rename from kiauh/menus/__init__.py rename to kiauh/core/instance_manager/__init__.py diff --git a/kiauh/instance_manager/base_instance.py b/kiauh/core/instance_manager/base_instance.py similarity index 100% rename from kiauh/instance_manager/base_instance.py rename to kiauh/core/instance_manager/base_instance.py diff --git a/kiauh/instance_manager/instance_manager.py b/kiauh/core/instance_manager/instance_manager.py similarity index 99% rename from kiauh/instance_manager/instance_manager.py rename to kiauh/core/instance_manager/instance_manager.py index da75ba9..3318d45 100644 --- a/kiauh/instance_manager/instance_manager.py +++ b/kiauh/core/instance_manager/instance_manager.py @@ -14,7 +14,7 @@ import re import subprocess from typing import List, Optional, Union, TypeVar -from kiauh.instance_manager.base_instance import BaseInstance +from kiauh.core.instance_manager.base_instance import BaseInstance from kiauh.utils.constants import SYSTEMD from kiauh.utils.logger import Logger diff --git a/kiauh/repo_manager/__init__.py b/kiauh/core/menus/__init__.py similarity index 100% rename from kiauh/repo_manager/__init__.py rename to kiauh/core/menus/__init__.py diff --git a/kiauh/menus/advanced_menu.py b/kiauh/core/menus/advanced_menu.py similarity index 97% rename from kiauh/menus/advanced_menu.py rename to kiauh/core/menus/advanced_menu.py index 9b0ca85..b029d4a 100644 --- a/kiauh/menus/advanced_menu.py +++ b/kiauh/core/menus/advanced_menu.py @@ -11,7 +11,7 @@ import textwrap -from kiauh.menus.base_menu import BaseMenu +from kiauh.core.menus.base_menu import BaseMenu from kiauh.utils.constants import COLOR_YELLOW, RESET_FORMAT diff --git a/kiauh/menus/base_menu.py b/kiauh/core/menus/base_menu.py similarity index 100% rename from kiauh/menus/base_menu.py rename to kiauh/core/menus/base_menu.py diff --git a/kiauh/menus/install_menu.py b/kiauh/core/menus/install_menu.py similarity index 98% rename from kiauh/menus/install_menu.py rename to kiauh/core/menus/install_menu.py index 54b5148..f1b299e 100644 --- a/kiauh/menus/install_menu.py +++ b/kiauh/core/menus/install_menu.py @@ -11,7 +11,7 @@ import textwrap -from kiauh.menus.base_menu import BaseMenu +from kiauh.core.menus.base_menu import BaseMenu from kiauh.modules.klipper import klipper_setup from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT diff --git a/kiauh/menus/main_menu.py b/kiauh/core/menus/main_menu.py similarity index 89% rename from kiauh/menus/main_menu.py rename to kiauh/core/menus/main_menu.py index 9cffebb..76bcd8b 100644 --- a/kiauh/menus/main_menu.py +++ b/kiauh/core/menus/main_menu.py @@ -11,12 +11,12 @@ import textwrap -from kiauh.menus.advanced_menu import AdvancedMenu -from kiauh.menus.base_menu import BaseMenu -from kiauh.menus.install_menu import InstallMenu -from kiauh.menus.remove_menu import RemoveMenu -from kiauh.menus.settings_menu import SettingsMenu -from kiauh.menus.update_menu import UpdateMenu +from kiauh.core.menus.advanced_menu import AdvancedMenu +from kiauh.core.menus.base_menu import BaseMenu +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.utils.constants import COLOR_MAGENTA, COLOR_CYAN, RESET_FORMAT diff --git a/kiauh/menus/remove_menu.py b/kiauh/core/menus/remove_menu.py similarity index 98% rename from kiauh/menus/remove_menu.py rename to kiauh/core/menus/remove_menu.py index 1fb2492..861ca48 100644 --- a/kiauh/menus/remove_menu.py +++ b/kiauh/core/menus/remove_menu.py @@ -11,7 +11,7 @@ import textwrap -from kiauh.menus.base_menu import BaseMenu +from kiauh.core.menus.base_menu import BaseMenu from kiauh.modules.klipper import klipper_setup from kiauh.utils.constants import COLOR_RED, RESET_FORMAT diff --git a/kiauh/menus/settings_menu.py b/kiauh/core/menus/settings_menu.py similarity index 96% rename from kiauh/menus/settings_menu.py rename to kiauh/core/menus/settings_menu.py index dcef3df..d56f284 100644 --- a/kiauh/menus/settings_menu.py +++ b/kiauh/core/menus/settings_menu.py @@ -9,7 +9,7 @@ # This file may be distributed under the terms of the GNU GPLv3 license # # ======================================================================= # -from kiauh.menus.base_menu import BaseMenu +from kiauh.core.menus.base_menu import BaseMenu # noinspection PyMethodMayBeStatic diff --git a/kiauh/menus/update_menu.py b/kiauh/core/menus/update_menu.py similarity index 98% rename from kiauh/menus/update_menu.py rename to kiauh/core/menus/update_menu.py index f617fe9..eebe8ee 100644 --- a/kiauh/menus/update_menu.py +++ b/kiauh/core/menus/update_menu.py @@ -11,7 +11,7 @@ import textwrap -from kiauh.menus.base_menu import BaseMenu +from kiauh.core.menus.base_menu import BaseMenu from kiauh.modules.klipper.klipper_setup import update_klipper from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT diff --git a/kiauh/core/repo_manager/__init__.py b/kiauh/core/repo_manager/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/kiauh/repo_manager/repo_manager.py b/kiauh/core/repo_manager/repo_manager.py similarity index 100% rename from kiauh/repo_manager/repo_manager.py rename to kiauh/core/repo_manager/repo_manager.py diff --git a/kiauh/main.py b/kiauh/main.py index 2bab667..5f826c8 100644 --- a/kiauh/main.py +++ b/kiauh/main.py @@ -9,7 +9,7 @@ # This file may be distributed under the terms of the GNU GPLv3 license # # ======================================================================= # -from kiauh.menus.main_menu import MainMenu +from kiauh.core.menus.main_menu import MainMenu from kiauh.utils.logger import Logger diff --git a/kiauh/modules/klipper/klipper.py b/kiauh/modules/klipper/klipper.py index 33c4ec3..2d6c82f 100644 --- a/kiauh/modules/klipper/klipper.py +++ b/kiauh/modules/klipper/klipper.py @@ -15,7 +15,7 @@ import subprocess from pathlib import Path from typing import List -from kiauh.instance_manager.base_instance import BaseInstance +from kiauh.core.instance_manager.base_instance import BaseInstance from kiauh.modules.klipper import KLIPPER_DIR, KLIPPER_ENV_DIR from kiauh.utils.constants import SYSTEMD from kiauh.utils.logger import Logger diff --git a/kiauh/modules/klipper/klipper_dialogs.py b/kiauh/modules/klipper/klipper_dialogs.py index 1dacd59..cad0cf7 100644 --- a/kiauh/modules/klipper/klipper_dialogs.py +++ b/kiauh/modules/klipper/klipper_dialogs.py @@ -12,8 +12,8 @@ import textwrap from typing import List -from kiauh.instance_manager.base_instance import BaseInstance -from kiauh.menus.base_menu import print_back_footer +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 diff --git a/kiauh/modules/klipper/klipper_setup.py b/kiauh/modules/klipper/klipper_setup.py index c4a90a1..070eca8 100644 --- a/kiauh/modules/klipper/klipper_setup.py +++ b/kiauh/modules/klipper/klipper_setup.py @@ -14,8 +14,8 @@ import subprocess from pathlib import Path from typing import List, Union -from kiauh.config_manager.config_manager import ConfigManager -from kiauh.instance_manager.instance_manager import InstanceManager +from kiauh.core.config_manager.config_manager import ConfigManager +from kiauh.core.instance_manager.instance_manager import InstanceManager from kiauh.modules.klipper import ( EXIT_KLIPPER_SETUP, DEFAULT_KLIPPER_REPO_URL, @@ -37,7 +37,7 @@ from kiauh.modules.klipper.klipper_utils import ( check_user_groups, handle_single_to_multi_conversion, ) -from kiauh.repo_manager.repo_manager import RepoManager +from kiauh.core.repo_manager.repo_manager import RepoManager from kiauh.utils.input_utils import ( get_confirm, get_number_input, diff --git a/kiauh/modules/klipper/klipper_utils.py b/kiauh/modules/klipper/klipper_utils.py index 1a93037..7a1b241 100644 --- a/kiauh/modules/klipper/klipper_utils.py +++ b/kiauh/modules/klipper/klipper_utils.py @@ -17,7 +17,7 @@ import textwrap from typing import List, Union -from kiauh.instance_manager.instance_manager import InstanceManager +from kiauh.core.instance_manager.instance_manager import InstanceManager from kiauh.modules.klipper.klipper import Klipper from kiauh.modules.klipper.klipper_dialogs import ( print_missing_usergroup_dialog,