From 8970f461540d4ae774b3f8f421af7a8a17d36de1 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 20 Jun 2022 11:04:14 +0200 Subject: [PATCH] Better path to packages.json in the 3MF file Let's put it in the Cura directory with the rest of such files, as to not muddy the 3MF file with all sorts of directories that are not known to other consumers. Contributes to issue CURA-9413. --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 4 ++-- plugins/3MFWriter/ThreeMFWriter.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 3c096318b5..c8f7bc8abd 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -1253,12 +1253,12 @@ class ThreeMFWorkspaceReader(WorkspaceReader): @staticmethod def _parse_packages_metadata(archive: zipfile.ZipFile) -> List[Dict[str, str]]: try: - package_metadata = json.loads(archive.open("Metadata/packages.json").read().decode("utf-8")) + package_metadata = json.loads(archive.open("Cura/packages.json").read().decode("utf-8")) return package_metadata["packages"] except KeyError: Logger.warning("No package metadata was found in .3mf file.") except Exception: - Logger.error("Failed to load packes metadata from .3mf file") + Logger.error("Failed to load packages metadata from .3mf file.") return [] diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index d17218c578..c507703823 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -41,7 +41,7 @@ catalog = i18nCatalog("cura") THUMBNAIL_PATH = "Metadata/thumbnail.png" MODEL_PATH = "3D/3dmodel.model" -PACKAGE_METADATA_PATH = "Metadata/packages.json" +PACKAGE_METADATA_PATH = "Cura/packages.json" class ThreeMFWriter(MeshWriter): def __init__(self):