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

chore: cleanup

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2024-06-28 20:13:44 +02:00
parent 3ec5e1a3b8
commit ca493e91ef
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,8 +20,6 @@ OE_STORE_DIR = OE_DIR.joinpath("octoeverywhere-store")
OE_REQ_FILE = OE_DIR.joinpath("requirements.txt") OE_REQ_FILE = OE_DIR.joinpath("requirements.txt")
OE_DEPS_JSON_FILE = OE_DIR.joinpath("moonraker-system-dependencies.json") OE_DEPS_JSON_FILE = OE_DIR.joinpath("moonraker-system-dependencies.json")
OE_INSTALL_SCRIPT = OE_DIR.joinpath("install.sh") OE_INSTALL_SCRIPT = OE_DIR.joinpath("install.sh")
OE_UPDATE_SCRIPT = OE_DIR.joinpath("update.sh")
OE_REMOVE_SCRIPT = OE_DIR.joinpath("uninstall.sh")
# filenames # filenames
OE_CFG_NAME = "octoeverywhere.conf" OE_CFG_NAME = "octoeverywhere.conf"

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

@@ -23,10 +23,7 @@ from components.octoeverywhere import (
from core.instance_manager.base_instance import BaseInstance from core.instance_manager.base_instance import BaseInstance
from utils.logger import Logger from utils.logger import Logger
MODULE_PATH = Path(__file__).resolve().parent
# noinspection PyMethodMayBeStatic
class Octoeverywhere(BaseInstance): class Octoeverywhere(BaseInstance):
@classmethod @classmethod
def blacklist(cls) -> List[str]: def blacklist(cls) -> List[str]:
@@ -45,6 +42,10 @@ class Octoeverywhere(BaseInstance):
def cfg_file(self) -> Path: def cfg_file(self) -> Path:
return self._cfg_file return self._cfg_file
@property
def sys_cfg_file(self) -> Path:
return self._sys_cfg_file
@property @property
def log(self) -> Path: def log(self) -> Path:
return self._log return self._log
@@ -54,7 +55,6 @@ class Octoeverywhere(BaseInstance):
try: try:
cmd = f"{OE_INSTALL_SCRIPT} {self.cfg_dir}/moonraker.conf" cmd = f"{OE_INSTALL_SCRIPT} {self.cfg_dir}/moonraker.conf"
print(cmd)
run(cmd, check=True, shell=True) run(cmd, check=True, shell=True)
except CalledProcessError as e: except CalledProcessError as e:

4
kiauh/components/octoeverywhere/octoeverywhere_setup.py
View File

@@ -64,6 +64,8 @@ def install_octoeverywhere() -> None:
"It is save to run the installer again to link your " "It is save to run the installer again to link your "
"printer or repair any issues.", "printer or repair any issues.",
], ],
padding_top=0,
padding_bottom=0,
) )
if not get_confirm("Re-run OctoEverywhere installation?"): if not get_confirm("Re-run OctoEverywhere installation?"):
Logger.print_info("Exiting OctoEverywhere for Klipper installation ...") Logger.print_info("Exiting OctoEverywhere for Klipper installation ...")
@@ -84,6 +86,8 @@ def install_octoeverywhere() -> None:
"\n\n", "\n\n",
"The setup will apply the same names to OctoEverywhere!", "The setup will apply the same names to OctoEverywhere!",
], ],
padding_top=0,
padding_bottom=0,
) )
if not get_confirm( if not get_confirm(