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

refactor: improve klipper class structure

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2024-06-30 21:40:48 +02:00
parent 7632c3c980
commit 0cb1e35b06
1 changed files with 52 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,18 +61,10 @@ class Klipper(BaseInstance):
def create(self) -> None: def create(self) -> None:
Logger.print_status("Creating new Klipper Instance ...") Logger.print_status("Creating new Klipper Instance ...")
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(KLIPPER_ENV_FILE_NAME)
try: try:
self.create_folders() self.create_folders()
self._write_service_file( self._write_service_file()
KLIPPER_SERVICE_TEMPLATE, self._write_env_file()
service_file_target,
env_file_target,
)
self._write_env_file(KLIPPER_ENV_FILE_TEMPLATE, env_file_target)
except CalledProcessError as e: except CalledProcessError as e:
Logger.print_error(f"Error creating instance: {e}") Logger.print_error(f"Error creating instance: {e}")
@@ -96,15 +88,10 @@ class Klipper(BaseInstance):
Logger.print_error(f"Error removing instance: {e}") Logger.print_error(f"Error removing instance: {e}")
raise raise
def _write_service_file( def _write_service_file(self) -> None:
self, service_file_name = self.get_service_file_name(extension=True)
service_template_path: Path, service_file_target = SYSTEMD.joinpath(service_file_name)
service_file_target: Path, service_content = self._prep_service_file()
env_file_target: Path,
) -> None:
service_content = self._prep_service_file(
service_template_path, env_file_target
)
command = ["sudo", "tee", service_file_target] command = ["sudo", "tee", service_file_target]
run( run(
command, command,
@@ -114,52 +101,73 @@ class Klipper(BaseInstance):
) )
Logger.print_ok(f"Service file created: {service_file_target}") Logger.print_ok(f"Service file created: {service_file_target}")
def _write_env_file( def _write_env_file(self) -> None:
self, env_template_file_path: Path, env_file_target: Path env_file_content = self._prep_env_file()
) -> None: env_file_target = self.sysd_dir.joinpath(KLIPPER_ENV_FILE_NAME)
env_file_content = self._prep_env_file(env_template_file_path)
with open(env_file_target, "w") as env_file: with open(env_file_target, "w") as env_file:
env_file.write(env_file_content) env_file.write(env_file_content)
Logger.print_ok(f"Env file created: {env_file_target}") Logger.print_ok(f"Env file created: {env_file_target}")
def _prep_service_file( def _prep_service_file(self) -> str:
self, service_template_path: Path, env_file_path: Path template = KLIPPER_SERVICE_TEMPLATE
) -> str:
try: try:
with open(service_template_path, "r") as template_file: with open(template, "r") as template_file:
template_content = template_file.read() template_content = template_file.read()
except FileNotFoundError: except FileNotFoundError:
Logger.print_error( Logger.print_error(f"Unable to open {template} - File not found")
f"Unable to open {service_template_path} - File not found"
)
raise raise
service_content = template_content.replace("%USER%", self.user)
service_content = service_content.replace( service_content = template_content.replace(
"%KLIPPER_DIR%", str(self.klipper_dir) "%USER%",
self.user,
)
service_content = service_content.replace(
"%KLIPPER_DIR%",
self.klipper_dir.as_posix(),
)
service_content = service_content.replace(
"%ENV%",
self.env_dir.as_posix(),
)
service_content = service_content.replace(
"%ENV_FILE%",
self.sysd_dir.joinpath(KLIPPER_ENV_FILE_NAME).as_posix(),
) )
service_content = service_content.replace("%ENV%", str(self.env_dir))
service_content = service_content.replace("%ENV_FILE%", str(env_file_path))
return service_content return service_content
def _prep_env_file(self, env_template_file_path: Path) -> str: def _prep_env_file(self) -> str:
template = KLIPPER_ENV_FILE_TEMPLATE
try: try:
with open(env_template_file_path, "r") as env_file: with open(template, "r") as env_file:
env_template_file_content = env_file.read() env_template_file_content = env_file.read()
except FileNotFoundError: except FileNotFoundError:
Logger.print_error( Logger.print_error(f"Unable to open {template} - File not found")
f"Unable to open {env_template_file_path} - File not found"
)
raise raise
env_file_content = env_template_file_content.replace( env_file_content = env_template_file_content.replace(
"%KLIPPER_DIR%", str(self.klipper_dir) "%KLIPPER_DIR%", self.klipper_dir.as_posix()
) )
env_file_content = env_file_content.replace( env_file_content = env_file_content.replace(
"%CFG%", "%CFG%",
f"{self.cfg_dir}/{KLIPPER_CFG_NAME}", f"{self.cfg_dir}/{KLIPPER_CFG_NAME}",
) )
env_file_content = env_file_content.replace("%SERIAL%", str(self.serial)) env_file_content = env_file_content.replace(
env_file_content = env_file_content.replace("%LOG%", str(self.log)) "%SERIAL%",
env_file_content = env_file_content.replace("%UDS%", str(self.uds)) self.serial.as_posix(),
)
env_file_content = env_file_content.replace(
"%LOG%",
self.log.as_posix(),
)
env_file_content = env_file_content.replace(
"%UDS%",
self.uds.as_posix(),
)
return env_file_content return env_file_content
def _delete_logfiles(self) -> None: def _delete_logfiles(self) -> None: