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

file_manager: check for new metadata on each call to _list_directory 

Previously this check was only on done when a directory was requested by the API.  Moving this check to _list_directory ()updates metadata for internal calls as well.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-01-06 06:43:08 -05:00
parent fa53d889d0
commit 40f876192c
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
moonraker/plugins/file_manager.py
View File

@ -140,18 +140,7 @@ class FileManager:
if action == 'GET': if action == 'GET':
is_extended = web_request.get_boolean('extended', False) is_extended = web_request.get_boolean('extended', False)
# 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, is_extended)
# Check to see if a filelist update is necessary
for f in dir_info['files']:
fname = os.path.join(rel_path, f['filename'])
ext = os.path.splitext(f['filename'])[-1].lower()
if root != 'gcodes' or ext not in VALID_GCODE_EXTS:
continue
self.gcode_metadata.parse_metadata(
fname, f['size'], f['modified'], notify=True)
metadata = self.gcode_metadata.get(fname, None)
if metadata is not None and is_extended:
f.update(metadata)
return dir_info return dir_info
elif action == 'POST' and root in FULL_ACCESS_ROOTS: elif action == 'POST' and root in FULL_ACCESS_ROOTS:
# Create a new directory # Create a new directory
@ -273,7 +262,7 @@ class FileManager:
{'path': src_rel_path, 'root': source_root}) {'path': src_rel_path, 'root': source_root})
return "ok" return "ok"
def _list_directory(self, path): def _list_directory(self, path, is_extended=False):
if not os.path.isdir(path): if not os.path.isdir(path):
raise self.server.error( raise self.server.error(
f"Directory does not exist ({path})") f"Directory does not exist ({path})")
@ -288,6 +277,18 @@ class FileManager:
flist['dirs'].append(path_info) flist['dirs'].append(path_info)
elif os.path.isfile(full_path): elif os.path.isfile(full_path):
path_info['filename'] = fname path_info['filename'] = fname
# Check to see if a filelist update is necessary
ext = os.path.splitext(fname)[-1].lower()
gc_path = self.file_paths.get('gcodes', None)
if gc_path is not None and full_path.startswith(gc_path) and \
ext in VALID_GCODE_EXTS:
rel_path = os.path.relpath(full_path, start=gc_path)
self.gcode_metadata.parse_metadata(
rel_path, path_info['size'], path_info['modified'],
notify=True)
metadata = self.gcode_metadata.get(rel_path, None)
if metadata is not None and is_extended:
path_info.update(metadata)
flist['files'].append(path_info) flist['files'].append(path_info)
usage = shutil.disk_usage(path) usage = shutil.disk_usage(path)
flist['disk_usage'] = usage._asdict() flist['disk_usage'] = usage._asdict()
@ -506,8 +507,7 @@ class FileManager:
return self.gcode_metadata.get(filename, flist.get(filename, {})) return self.gcode_metadata.get(filename, flist.get(filename, {}))
def list_dir(self, directory, simple_format=False): def list_dir(self, directory, simple_format=False):
# List a directory relative to its root. Currently the only # List a directory relative to its root.
# Supported root is "gcodes"
if directory[0] == "/": if directory[0] == "/":
directory = directory[1:] directory = directory[1:]
parts = directory.split("/", 1) parts = directory.split("/", 1)