CreatBot/CreatBotMoonraker
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

file_manager: extract UFP files to disk rather than memory

Browse Source 
The prior implementations assumed that uploaded files would be buffered in memory.
This is no longer the case, so UFP extraction is more efficient when done straight to disk.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine
2021-03-05 08:50:56 -05:00
parent db13827a48
commit 4efce1b868
1 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
moonraker/plugins/file_manager.py
View File

@@ -19,6 +19,9 @@ FULL_ACCESS_ROOTS = ["gcodes", "config"]
METADATA_SCRIPT = os.path.abspath(os.path.join( METADATA_SCRIPT = os.path.abspath(os.path.join(
os.path.dirname(__file__), "../../scripts/extract_metadata.py")) os.path.dirname(__file__), "../../scripts/extract_metadata.py"))
UFP_MODEL_PATH = "/3D/model.gcode"
UFP_THUMB_PATH = "/Metadata/thumbnail.png"
class FileManager: class FileManager:
def __init__(self, config): def __init__(self, config):
self.server = config.get_server() self.server = config.get_server()
@@ -452,36 +455,30 @@ class FileManager:
shutil.move(upload_info['tmp_file_path'], shutil.move(upload_info['tmp_file_path'],
upload_info['dest_path']) upload_info['dest_path'])
except Exception: except Exception:
logging.exception("Upload Write Error")
raise self.server.error("Unable to save file", 500) raise self.server.error("Unable to save file", 500)
# UFP Extraction Implementation inspired by GitHub user @cdkeito # UFP Extraction Implementation inspired by GitHub user @cdkeito
def _unzip_ufp(self, ufp_path, dest_path): def _unzip_ufp(self, ufp_path, dest_path):
gc_bytes = img_bytes = None
with zipfile.ZipFile(ufp_path) as zf:
gc_bytes = zf.read("/3D/model.gcode")
try:
img_bytes = zf.read("/Metadata/thumbnail.png")
except Exception:
img_bytes = None
if gc_bytes is not None:
with open(dest_path, "wb") as gc_file:
gc_file.write(gc_bytes)
else:
raise self.server.error(
f"UFP file {dest_path} does not "
"contain a gcode file")
if img_bytes is not None:
thumb_name = os.path.splitext( thumb_name = os.path.splitext(
os.path.basename(dest_path))[0] + ".png" os.path.basename(dest_path))[0] + ".png"
thumb_dir = os.path.join(os.path.dirname(dest_path), "thumbs") dest_thumb_dir = os.path.join(os.path.dirname(dest_path), "thumbs")
thumb_path = os.path.join(thumb_dir, thumb_name) dest_thumb_path = os.path.join(dest_thumb_dir, thumb_name)
try: try:
if not os.path.exists(thumb_dir): with tempfile.TemporaryDirectory() as tmp_dir_name:
os.mkdir(thumb_dir) tmp_thumb_path = ""
with open(thumb_path, "wb") as thumb_file: with zipfile.ZipFile(ufp_path) as zf:
thumb_file.write(img_bytes) tmp_model_path = zf.extract(
except Exception: UFP_MODEL_PATH, path=tmp_dir_name)
logging.exception("Unable to write Image") if UFP_THUMB_PATH in zf.namelist():
tmp_thumb_path = zf.extract(
UFP_THUMB_PATH, path=tmp_dir_name)
shutil.move(tmp_model_path, dest_path)
if tmp_thumb_path:
if not os.path.exists(dest_thumb_dir):
os.mkdir(dest_thumb_dir)
shutil.move(tmp_thumb_path, dest_thumb_path)
finally:
try: try:
os.remove(ufp_path) os.remove(ufp_path)
except Exception: except Exception: