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

file_manager: set a metadata version to force re-processing 

When an entry is removed from metadata also remove associated thumbnails.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-03-14 14:24:51 -04:00
parent 05b8c4eaef
commit ca2bd380cf
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
moonraker/plugins/file_manager.py
View File

@ -622,6 +622,7 @@ class FileManager:
METADATA_PRUNE_TIME = 600000 METADATA_PRUNE_TIME = 600000
METADATA_NAMESPACE = "gcode_metadata" METADATA_NAMESPACE = "gcode_metadata"
METADATA_VERSION = 2
class MetadataStorage: class MetadataStorage:
def __init__(self, server, gc_path, database): def __init__(self, server, gc_path, database):
@ -629,6 +630,14 @@ class MetadataStorage:
database.register_local_namespace(METADATA_NAMESPACE) database.register_local_namespace(METADATA_NAMESPACE)
self.mddb = database.wrap_namespace( self.mddb = database.wrap_namespace(
METADATA_NAMESPACE, parse_keys=False) METADATA_NAMESPACE, parse_keys=False)
version = database.get_item(
"moonraker", "file_manager.metadata_version", 0)
if version != METADATA_VERSION:
# Clear existing metadata when version is bumped
self.mddb.clear()
database.insert_item(
"moonraker", "file_manager.metadata_version",
METADATA_VERSION)
self.pending_requests = {} self.pending_requests = {}
self.events = {} self.events = {}
self.busy = False self.busy = False
@ -657,7 +666,7 @@ class MetadataStorage:
for fname in list(self.mddb.keys()): for fname in list(self.mddb.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):
del self.mddb[fname] self.remove_file(fname)
logging.info(f"Pruned file: {fname}") logging.info(f"Pruned file: {fname}")
continue continue
@ -666,10 +675,21 @@ class MetadataStorage:
return mdata['size'] == fsize and mdata['modified'] == modified return mdata['size'] == fsize and mdata['modified'] == modified
def remove_file(self, fname): def remove_file(self, fname):
try: metadata = self.mddb.pop(fname, None)
del self.mddb[fname] if metadata is None:
except Exception: return
pass # Delete associated thumbnails
fdir = os.path.dirname(os.path.join(self.gc_path, fname))
if "thumbnails" in metadata:
for thumb in metadata["thumbnails"]:
path = thumb.get("relative_path", None)
if path is None:
continue
thumb_path = os.path.join(fdir, path)
try:
os.remove(thumb_path)
except Exception:
logging.debug(f"Error removing thumb at {thumb_path}")
def parse_metadata(self, fname, fsize, modified, notify=False): def parse_metadata(self, fname, fsize, modified, notify=False):
evt = Event() evt = Event()