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

file_manager: add "extended" argument to directory endpoint 

If extended==True is passed to GET directory then the result for each gcode file will include associate metadata, if present.

SIgned-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2020-11-02 17:18:13 -05:00
parent f14b1f3ff0
commit 624be50026
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
moonraker/plugins/file_manager.py
View File

@ -118,6 +118,15 @@ class FileManager:
base, url_path, dir_path = self._convert_path(directory) base, url_path, dir_path = self._convert_path(directory)
method = method.upper() method = method.upper()
if method == 'GET': if method == 'GET':
need_update = False
is_extended = args.get('extended', False)
if isinstance(is_extended, str):
val = is_extended.lower()
if val in ["true", "false"]:
is_extended = True if val == "true" else False
if not isinstance(is_extended, bool):
raise self.server.error(
f"Invalid argument for 'extended': {is_extended}")
# Get list of files and subdirectories for this target # Get list of files and subdirectories for this target
dir_info = self._list_directory(dir_path) dir_info = self._list_directory(dir_path)
# Check to see if a filelist update is necessary # Check to see if a filelist update is necessary
@ -126,12 +135,17 @@ class FileManager:
ext = os.path.splitext(f['filename'])[-1].lower() ext = os.path.splitext(f['filename'])[-1].lower()
if base == 'gcodes' and ext not in VALID_GCODE_EXTS: if base == 'gcodes' and ext not in VALID_GCODE_EXTS:
continue continue
finfo = self.gcode_metadata.get(fname, None) metadata = self.gcode_metadata.get(fname, None)
if finfo is None or f['modified'] != finfo['modified']: if metadata is None or f['modified'] != metadata['modified']:
# Either a new file found or file has changed, update # Either a new file found or file has changed, update
# internal file list # internal file list
self._update_file_list(base, do_notify=True) need_update = True
if not is_extended:
break break
elif is_extended:
f.update(metadata)
if need_update:
self._update_file_list(base, do_notify=True)
return dir_info return dir_info
elif method == 'POST' and base in FULL_ACCESS_ROOTS: elif method == 'POST' and base in FULL_ACCESS_ROOTS:
# Create a new directory # Create a new directory