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

file_manager: validate Klipper config path 

Warn when Klipper's configuration file is not located in
the "config" subfolder of the datapath.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-11-26 19:30:59 -05:00
parent 7b8c2c3409
commit f3e13faf19
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,6 +164,23 @@ class FileManager:
self.server.register_static_file_handler( self.server.register_static_file_handler(
"klippy.log", log_path, force=True) "klippy.log", log_path, force=True)
# Validate config file
cfg_file: Optional[str] = paths.get("config_file")
cfg_parent = self.file_paths.get("config")
if cfg_file is not None and cfg_parent is not None:
cfg_path = pathlib.Path(cfg_file).resolve()
par_path = pathlib.Path(cfg_parent).resolve()
if par_path not in cfg_path.parents:
self.server.add_warning(
"file_manager: Klipper configuration file not located in "
"'config' folder.\n\n"
f"Klipper Config Path: {cfg_path}\n\n"
f"Config Folder: {par_path}",
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()
if "gcodes" in self.file_paths: if "gcodes" in self.file_paths: