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

fix(Klipper/Moonraker): config files now always have a Path, are never None anymore

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2023-12-25 22:03:44 +01:00
parent a9367cc064
commit 16a28ffda0
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kiauh/modules/klipper/klipper.py
View File

@@ -30,7 +30,7 @@ class Klipper(BaseInstance):
super().__init__(instance_type=self, suffix=suffix) super().__init__(instance_type=self, suffix=suffix)
self.klipper_dir: Path = KLIPPER_DIR self.klipper_dir: Path = KLIPPER_DIR
self.env_dir: Path = KLIPPER_ENV_DIR self.env_dir: Path = KLIPPER_ENV_DIR
self._cfg_file = self._get_cfg() self._cfg_file = self.cfg_dir.joinpath("printer.cfg")
self._log = self.log_dir.joinpath("klippy.log") self._log = self.log_dir.joinpath("klippy.log")
self._serial = self.comms_dir.joinpath("klippy.serial") self._serial = self.comms_dir.joinpath("klippy.serial")
self._uds = self.comms_dir.joinpath("klippy.sock") self._uds = self.comms_dir.joinpath("klippy.sock")
@@ -153,9 +153,3 @@ class Klipper(BaseInstance):
env_file_content = env_file_content.replace("%LOG%", str(self.log)) env_file_content = env_file_content.replace("%LOG%", str(self.log))
env_file_content = env_file_content.replace("%UDS%", str(self.uds)) env_file_content = env_file_content.replace("%UDS%", str(self.uds))
return env_file_content return env_file_content
def _get_cfg(self) -> Union[Path, None]:
cfg_file_loc = self.cfg_dir.joinpath("printer.cfg")
if cfg_file_loc.is_file():
return cfg_file_loc
return None

10
kiauh/modules/moonraker/moonraker.py
View File

@@ -31,7 +31,7 @@ class Moonraker(BaseInstance):
super().__init__(instance_type=self, suffix=suffix) super().__init__(instance_type=self, suffix=suffix)
self.moonraker_dir: Path = MOONRAKER_DIR self.moonraker_dir: Path = MOONRAKER_DIR
self.env_dir: Path = MOONRAKER_ENV_DIR self.env_dir: Path = MOONRAKER_ENV_DIR
self.cfg_file = self._get_cfg() self.cfg_file = self.cfg_dir.joinpath("moonraker.conf")
self.port = self._get_port() self.port = self._get_port()
self.backup_dir = self.data_dir.joinpath("backup") self.backup_dir = self.data_dir.joinpath("backup")
self.certs_dir = self.data_dir.joinpath("certs") self.certs_dir = self.data_dir.joinpath("certs")
@@ -138,14 +138,8 @@ class Moonraker(BaseInstance):
) )
return env_file_content return env_file_content
def _get_cfg(self) -> Union[Path, None]:
cfg_file_loc = self.cfg_dir.joinpath("moonraker.conf")
if cfg_file_loc.is_file():
return cfg_file_loc
return None
def _get_port(self) -> Union[int, None]: def _get_port(self) -> Union[int, None]:
if self.cfg_file is None: if not self.cfg_file.is_file():
return None return None
cm = ConfigManager(cfg_file=self.cfg_file) cm = ConfigManager(cfg_file=self.cfg_file)