From 988de58c4eef426e7a5f64a088c5defa164028ff Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 9 Aug 2021 17:13:40 +0200 Subject: [PATCH 1/2] Fix version upgrader for arachne CURA-8468 --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 2 ++ .../VersionUpgrade49to50/VersionUpgrade49to50.py | 2 ++ plugins/VersionUpgrade/VersionUpgrade49to50/__init__.py | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index ee8652839d..8184ad1443 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -377,7 +377,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader): # - the global stack DOESN'T exist but some/all of the extruder stacks exist # To simplify this, only check if the global stack exists or not global_stack_id = self._stripFileToId(global_stack_file) + serialized = archive.open(global_stack_file).read().decode("utf-8") + serialized = GlobalStack._updateSerialized(serialized, global_stack_file) machine_name = self._getMachineNameFromSerializedStack(serialized) self._machine_info.metadata_dict = self._getMetaDataDictFromSerializedStack(serialized) diff --git a/plugins/VersionUpgrade/VersionUpgrade49to50/VersionUpgrade49to50.py b/plugins/VersionUpgrade/VersionUpgrade49to50/VersionUpgrade49to50.py index 5e311f49e7..c6d5f202e6 100644 --- a/plugins/VersionUpgrade/VersionUpgrade49to50/VersionUpgrade49to50.py +++ b/plugins/VersionUpgrade/VersionUpgrade49to50/VersionUpgrade49to50.py @@ -107,6 +107,8 @@ class VersionUpgrade49to50(VersionUpgrade): # Update version number. if "metadata" not in parser: parser["metadata"] = {} + + parser["general"]["version"] = "5" parser["metadata"]["setting_version"] = "18" result = io.StringIO() diff --git a/plugins/VersionUpgrade/VersionUpgrade49to50/__init__.py b/plugins/VersionUpgrade/VersionUpgrade49to50/__init__.py index a3660b6c1d..a465f5a263 100644 --- a/plugins/VersionUpgrade/VersionUpgrade49to50/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade49to50/__init__.py @@ -15,8 +15,8 @@ def getMetaData() -> Dict[str, Any]: "version_upgrade": { # From To Upgrade function ("preferences", 6000016): ("preferences", 6000018, upgrade.upgradePreferences), - ("machine_stack", 4000016): ("machine_stack", 4000018, upgrade.upgradeStack), - ("extruder_train", 4000016): ("extruder_train", 4000018, upgrade.upgradeStack), + ("machine_stack", 4000016): ("machine_stack", 5000018, upgrade.upgradeStack), + ("extruder_train", 4000016): ("extruder_train", 5000018, upgrade.upgradeStack), ("definition_changes", 4000016): ("definition_changes", 4000018, upgrade.upgradeInstanceContainer), ("quality_changes", 4000016): ("quality_changes", 4000018, upgrade.upgradeInstanceContainer), ("quality", 4000016): ("quality", 4000018, upgrade.upgradeInstanceContainer), From a5d998224f9ef9a0fc7466f01a7a8b532d689638 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 9 Aug 2021 17:41:54 +0200 Subject: [PATCH 2/2] Add definitions to known current versions CURA-8468 --- cura/CuraApplication.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 7580a973c7..50b973df5e 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -471,6 +471,7 @@ class CuraApplication(QtApplication): ("definition_changes", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.DefinitionChangesContainer, "application/x-uranium-instancecontainer"), ("variant", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.VariantInstanceContainer, "application/x-uranium-instancecontainer"), ("setting_visibility", SettingVisibilityPresetsModel.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.SettingVisibilityPreset, "application/x-uranium-preferences"), + ("machine", 2): (Resources.DefinitionContainers, "application/x-uranium-definitioncontainer") } )