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

file_manager: clear metadata on item delete or move 

When a directory is deleted or moved go ahead and prune the storage.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2020-11-07 20:33:45 -05:00
parent 472c7c4b23
commit ffdcfd527a
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
moonraker/plugins/file_manager.py
View File

@ -165,6 +165,8 @@ class FileManager:
# loaded by the virtual_sdcard # loaded by the virtual_sdcard
await self._handle_operation_check(dir_path) await self._handle_operation_check(dir_path)
shutil.rmtree(dir_path) shutil.rmtree(dir_path)
if root == "gcodes":
self.gcode_metadata.prune_metadata()
else: else:
try: try:
os.rmdir(dir_path) os.rmdir(dir_path)
@ -237,6 +239,11 @@ class FileManager:
op_result = shutil.move(source_path, dest_path) op_result = shutil.move(source_path, dest_path)
except Exception as e: except Exception as e:
raise self.server.error(str(e)) raise self.server.error(str(e))
if source_root == "gcodes":
if os.path.isdir(op_result):
self.gcode_metadata.prune_metadata()
else:
self.gcode_metadata.remove_file(src_url_path)
action = "move_item" action = "move_item"
elif path == "/server/files/copy": elif path == "/server/files/copy":
try: try:
@ -520,6 +527,7 @@ class FileManager:
except self.server.error as e: except self.server.error as e:
if e.status_code == 403: if e.status_code == 403:
raise raise
self.gcode_metadata.remove_file(filename)
os.remove(full_path) os.remove(full_path)
self.notify_filelist_changed('delete_file', filename, root) self.notify_filelist_changed('delete_file', filename, root)
return filename return filename
@ -548,7 +556,7 @@ class MetadataStorage:
self.busy = False self.busy = False
self.gc_path = os.path.expanduser("~") self.gc_path = os.path.expanduser("~")
self.prune_cb = PeriodicCallback( self.prune_cb = PeriodicCallback(
self._prune_metadata, METADATA_PRUNE_TIME) self.prune_metadata, METADATA_PRUNE_TIME)
def update_gcode_path(self, path): def update_gcode_path(self, path):
if path == self.gc_path: if path == self.gc_path:
@ -582,7 +590,7 @@ class MetadataStorage:
if 'file' in proc_resp: if 'file' in proc_resp:
self.script_response = proc_resp self.script_response = proc_resp
def _prune_metadata(self): def prune_metadata(self):
for fname in list(self.metadata.keys()): for fname in list(self.metadata.keys()):
fpath = os.path.join(self.gc_path, fname) fpath = os.path.join(self.gc_path, fname)
if not os.path.exists(fpath): if not os.path.exists(fpath):
@ -594,6 +602,9 @@ class MetadataStorage:
mdata = self.metadata.get(fname, {'size': "", 'modified': 0}) mdata = self.metadata.get(fname, {'size': "", 'modified': 0})
return mdata['size'] == fsize and mdata['modified'] == modified return mdata['size'] == fsize and mdata['modified'] == modified
def remove_file(self, fname):
self.metadata.pop(fname)
def parse_metadata(self, fname, fsize, modified, notify=False): def parse_metadata(self, fname, fsize, modified, notify=False):
if fname in self.pending_requests or \ if fname in self.pending_requests or \
self._has_valid_data(fname, fsize, modified): self._has_valid_data(fname, fsize, modified):