3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

file_manager: improve klipper config detection 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2023-02-13 15:24:10 -05:00
parent bec9a66411
commit a40dae2bc8
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
moonraker/components/file_manager/file_manager.py
View File

@ -176,9 +176,14 @@ class FileManager:
cfg_file: Optional[str] = paths.get("config_file") cfg_file: Optional[str] = paths.get("config_file")
cfg_parent = self.file_paths.get("config") cfg_parent = self.file_paths.get("config")
if cfg_file is not None and cfg_parent is not None: if cfg_file is not None and cfg_parent is not None:
cfg_path = pathlib.Path(cfg_file).resolve() cfg_path = pathlib.Path(cfg_file).expanduser()
par_path = pathlib.Path(cfg_parent).resolve() par_path = pathlib.Path(cfg_parent)
if par_path not in cfg_path.parents: if (
par_path in cfg_path.parents or
par_path.resolve() in cfg_path.resolve().parents
):
self.server.remove_warning("klipper_config")
else:
self.server.add_warning( self.server.add_warning(
"file_manager: Klipper configuration file not located in " "file_manager: Klipper configuration file not located in "
"'config' folder.\n\n" "'config' folder.\n\n"
@ -186,8 +191,6 @@ class FileManager:
f"Config Folder: {par_path}", f"Config Folder: {par_path}",
warn_id="klipper_config" warn_id="klipper_config"
) )
else:
self.server.remove_warning("klipper_config")
def validate_gcode_path(self, gc_path: str) -> None: def validate_gcode_path(self, gc_path: str) -> None:
gc_dir = pathlib.Path(gc_path).expanduser() gc_dir = pathlib.Path(gc_path).expanduser()