From 1836beab42b10dacd7f773742e413121bbf1d765 Mon Sep 17 00:00:00 2001 From: dw-0 Date: Sun, 17 Dec 2023 00:01:25 +0100 Subject: [PATCH] feat(klipper): add getter for specific properties Signed-off-by: Dominik Willner --- kiauh/modules/klipper/klipper.py | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/kiauh/modules/klipper/klipper.py b/kiauh/modules/klipper/klipper.py index 636d173..ba9e1b5 100644 --- a/kiauh/modules/klipper/klipper.py +++ b/kiauh/modules/klipper/klipper.py @@ -31,10 +31,26 @@ class Klipper(BaseInstance): super().__init__(instance_type=self, suffix=suffix) self.klipper_dir = KLIPPER_DIR self.env_dir = KLIPPER_ENV_DIR - self.cfg_file = f"{self.cfg_dir}/printer.cfg" - self.log = f"{self.log_dir}/klippy.log" - self.serial = f"{self.comms_dir}/klippy.serial" - self.uds = f"{self.comms_dir}/klippy.sock" + self._cfg_file = f"{self.cfg_dir}/printer.cfg" + self._log = f"{self.log_dir}/klippy.log" + self._serial = f"{self.comms_dir}/klippy.serial" + self._uds = f"{self.comms_dir}/klippy.sock" + + @property + def cfg_file(self) -> str: + return self._cfg_file + + @property + def log(self) -> str: + return self._log + + @property + def serial(self) -> str: + return self._serial + + @property + def uds(self) -> str: + return self._uds def create(self) -> None: Logger.print_status("Creating new Klipper Instance ...") @@ -140,8 +156,8 @@ class Klipper(BaseInstance): env_file_content = env_template_file_content.replace( "%KLIPPER_DIR%", self.klipper_dir ) - env_file_content = env_file_content.replace("%CFG%", self.cfg_file) - env_file_content = env_file_content.replace("%SERIAL%", self.serial) - env_file_content = env_file_content.replace("%LOG%", self.log) - env_file_content = env_file_content.replace("%UDS%", self.uds) + env_file_content = env_file_content.replace("%CFG%", self._cfg_file) + env_file_content = env_file_content.replace("%SERIAL%", self._serial) + env_file_content = env_file_content.replace("%LOG%", self._log) + env_file_content = env_file_content.replace("%UDS%", self._uds) return env_file_content