From 7cb2231584ead920a4914b3177c79239217fec4b Mon Sep 17 00:00:00 2001 From: dw-0 Date: Mon, 29 Jan 2024 21:28:01 +0100 Subject: [PATCH] chore(kiauh): rename "res" to "assets" Signed-off-by: Dominik Willner --- kiauh/components/klipper/{res => assets}/klipper.env | 0 kiauh/components/klipper/{res => assets}/klipper.service | 0 kiauh/components/klipper/{res => assets}/printer.cfg | 0 kiauh/components/klipper/klipper.py | 4 ++-- kiauh/components/klipper/klipper_utils.py | 2 +- .../mainsail/{res => assets}/mainsail-config-updater.conf | 0 .../mainsail/{res => assets}/mainsail-updater.conf | 0 kiauh/components/mainsail/mainsail_setup.py | 2 +- kiauh/components/moonraker/{res => assets}/moonraker.conf | 0 kiauh/components/moonraker/{res => assets}/moonraker.env | 0 .../components/moonraker/{res => assets}/moonraker.service | 0 kiauh/components/moonraker/moonraker.py | 4 ++-- kiauh/components/moonraker/moonraker_utils.py | 2 +- kiauh/utils/{res => assets}/common_vars.conf | 0 kiauh/utils/{res => assets}/nginx_cfg | 0 kiauh/utils/{res => assets}/upstreams.conf | 0 kiauh/utils/filesystem_utils.py | 6 +++--- 17 files changed, 10 insertions(+), 10 deletions(-) rename kiauh/components/klipper/{res => assets}/klipper.env (100%) rename kiauh/components/klipper/{res => assets}/klipper.service (100%) rename kiauh/components/klipper/{res => assets}/printer.cfg (100%) rename kiauh/components/mainsail/{res => assets}/mainsail-config-updater.conf (100%) rename kiauh/components/mainsail/{res => assets}/mainsail-updater.conf (100%) rename kiauh/components/moonraker/{res => assets}/moonraker.conf (100%) rename kiauh/components/moonraker/{res => assets}/moonraker.env (100%) rename kiauh/components/moonraker/{res => assets}/moonraker.service (100%) rename kiauh/utils/{res => assets}/common_vars.conf (100%) rename kiauh/utils/{res => assets}/nginx_cfg (100%) rename kiauh/utils/{res => assets}/upstreams.conf (100%) diff --git a/kiauh/components/klipper/res/klipper.env b/kiauh/components/klipper/assets/klipper.env similarity index 100% rename from kiauh/components/klipper/res/klipper.env rename to kiauh/components/klipper/assets/klipper.env diff --git a/kiauh/components/klipper/res/klipper.service b/kiauh/components/klipper/assets/klipper.service similarity index 100% rename from kiauh/components/klipper/res/klipper.service rename to kiauh/components/klipper/assets/klipper.service diff --git a/kiauh/components/klipper/res/printer.cfg b/kiauh/components/klipper/assets/printer.cfg similarity index 100% rename from kiauh/components/klipper/res/printer.cfg rename to kiauh/components/klipper/assets/printer.cfg diff --git a/kiauh/components/klipper/klipper.py b/kiauh/components/klipper/klipper.py index 78dc8f4..1f8e6e5 100644 --- a/kiauh/components/klipper/klipper.py +++ b/kiauh/components/klipper/klipper.py @@ -52,10 +52,10 @@ class Klipper(BaseInstance): def create(self) -> None: Logger.print_status("Creating new Klipper Instance ...") - service_template_path = MODULE_PATH.joinpath("res/klipper.service") + service_template_path = MODULE_PATH.joinpath("assets/klipper.service") service_file_name = self.get_service_file_name(extension=True) service_file_target = SYSTEMD.joinpath(service_file_name) - env_template_file_path = MODULE_PATH.joinpath("res/klipper.env") + env_template_file_path = MODULE_PATH.joinpath("assets/klipper.env") env_file_target = self.sysd_dir.joinpath("klipper.env") try: diff --git a/kiauh/components/klipper/klipper_utils.py b/kiauh/components/klipper/klipper_utils.py index c5de7bf..f49cdec 100644 --- a/kiauh/components/klipper/klipper_utils.py +++ b/kiauh/components/klipper/klipper_utils.py @@ -264,7 +264,7 @@ def create_example_printer_cfg(instance: Klipper) -> None: Logger.print_info(f"'{instance.cfg_file}' already exists.") return - source = MODULE_PATH.joinpath("res/printer.cfg") + source = MODULE_PATH.joinpath("assets/printer.cfg") target = instance.cfg_file try: shutil.copy(source, target) diff --git a/kiauh/components/mainsail/res/mainsail-config-updater.conf b/kiauh/components/mainsail/assets/mainsail-config-updater.conf similarity index 100% rename from kiauh/components/mainsail/res/mainsail-config-updater.conf rename to kiauh/components/mainsail/assets/mainsail-config-updater.conf diff --git a/kiauh/components/mainsail/res/mainsail-updater.conf b/kiauh/components/mainsail/assets/mainsail-updater.conf similarity index 100% rename from kiauh/components/mainsail/res/mainsail-updater.conf rename to kiauh/components/mainsail/assets/mainsail-updater.conf diff --git a/kiauh/components/mainsail/mainsail_setup.py b/kiauh/components/mainsail/mainsail_setup.py index 0149794..33b764a 100644 --- a/kiauh/components/mainsail/mainsail_setup.py +++ b/kiauh/components/mainsail/mainsail_setup.py @@ -229,7 +229,7 @@ def patch_moonraker_conf( Logger.print_info("Section already exist. Skipped ...") return - template = MODULE_PATH.joinpath("res", template_file) + template = MODULE_PATH.joinpath("assets", template_file) with open(template, "r") as t: template_content = "\n" template_content += t.read() diff --git a/kiauh/components/moonraker/res/moonraker.conf b/kiauh/components/moonraker/assets/moonraker.conf similarity index 100% rename from kiauh/components/moonraker/res/moonraker.conf rename to kiauh/components/moonraker/assets/moonraker.conf diff --git a/kiauh/components/moonraker/res/moonraker.env b/kiauh/components/moonraker/assets/moonraker.env similarity index 100% rename from kiauh/components/moonraker/res/moonraker.env rename to kiauh/components/moonraker/assets/moonraker.env diff --git a/kiauh/components/moonraker/res/moonraker.service b/kiauh/components/moonraker/assets/moonraker.service similarity index 100% rename from kiauh/components/moonraker/res/moonraker.service rename to kiauh/components/moonraker/assets/moonraker.service diff --git a/kiauh/components/moonraker/moonraker.py b/kiauh/components/moonraker/moonraker.py index 688b825..f33d039 100644 --- a/kiauh/components/moonraker/moonraker.py +++ b/kiauh/components/moonraker/moonraker.py @@ -39,8 +39,8 @@ class Moonraker(BaseInstance): def create(self, create_example_cfg: bool = False) -> None: Logger.print_status("Creating new Moonraker Instance ...") - service_template_path = MODULE_PATH.joinpath("res/moonraker.service") - env_template_file_path = MODULE_PATH.joinpath("res/moonraker.env") + service_template_path = MODULE_PATH.joinpath("assets/moonraker.service") + env_template_file_path = MODULE_PATH.joinpath("assets/moonraker.env") service_file_name = self.get_service_file_name(extension=True) service_file_target = SYSTEMD.joinpath(service_file_name) env_file_target = self.sysd_dir.joinpath("moonraker.env") diff --git a/kiauh/components/moonraker/moonraker_utils.py b/kiauh/components/moonraker/moonraker_utils.py index 2533b4d..017e00a 100644 --- a/kiauh/components/moonraker/moonraker_utils.py +++ b/kiauh/components/moonraker/moonraker_utils.py @@ -56,7 +56,7 @@ def create_example_moonraker_conf( Logger.print_info(f"'{instance.cfg_file}' already exists.") return - source = MODULE_PATH.joinpath("res/moonraker.conf") + source = MODULE_PATH.joinpath("assets/moonraker.conf") target = instance.cfg_file try: shutil.copy(source, target) diff --git a/kiauh/utils/res/common_vars.conf b/kiauh/utils/assets/common_vars.conf similarity index 100% rename from kiauh/utils/res/common_vars.conf rename to kiauh/utils/assets/common_vars.conf diff --git a/kiauh/utils/res/nginx_cfg b/kiauh/utils/assets/nginx_cfg similarity index 100% rename from kiauh/utils/res/nginx_cfg rename to kiauh/utils/assets/nginx_cfg diff --git a/kiauh/utils/res/upstreams.conf b/kiauh/utils/assets/upstreams.conf similarity index 100% rename from kiauh/utils/res/upstreams.conf rename to kiauh/utils/assets/upstreams.conf diff --git a/kiauh/utils/filesystem_utils.py b/kiauh/utils/filesystem_utils.py index 360461e..68ce432 100644 --- a/kiauh/utils/filesystem_utils.py +++ b/kiauh/utils/filesystem_utils.py @@ -79,7 +79,7 @@ def copy_upstream_nginx_cfg() -> None: Creates an upstream.conf in /etc/nginx/conf.d :return: None """ - source = MODULE_PATH.joinpath("res/upstreams.conf") + source = MODULE_PATH.joinpath("assets/upstreams.conf") target = NGINX_CONFD.joinpath("upstreams.conf") try: command = ["sudo", "cp", source, target] @@ -95,7 +95,7 @@ def copy_common_vars_nginx_cfg() -> None: Creates a common_vars.conf in /etc/nginx/conf.d :return: None """ - source = MODULE_PATH.joinpath("res/common_vars.conf") + source = MODULE_PATH.joinpath("assets/common_vars.conf") target = NGINX_CONFD.joinpath("common_vars.conf") try: command = ["sudo", "cp", source, target] @@ -115,7 +115,7 @@ def create_nginx_cfg(name: str, port: int, root_dir: Path) -> None: :return: None """ tmp = Path.home().joinpath(f"{name}.tmp") - shutil.copy(MODULE_PATH.joinpath("res/nginx_cfg"), tmp) + shutil.copy(MODULE_PATH.joinpath("assets/nginx_cfg"), tmp) with open(tmp, "r+") as f: content = f.read() content = content.replace("%NAME%", name)