From 2ca39c8e7f7162cdae229010b7948b80c4fa82cf Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 16 Jul 2019 14:31:38 +0200 Subject: [PATCH] Don't reparse entire file when checking for already extracted version CURA-6659 --- plugins/CuraProfileReader/CuraProfileReader.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/CuraProfileReader/CuraProfileReader.py b/plugins/CuraProfileReader/CuraProfileReader.py index 095c42319b..6394c1c385 100644 --- a/plugins/CuraProfileReader/CuraProfileReader.py +++ b/plugins/CuraProfileReader/CuraProfileReader.py @@ -8,6 +8,7 @@ from UM.PluginRegistry import PluginRegistry from UM.Logger import Logger from UM.Settings.ContainerFormatError import ContainerFormatError from UM.Settings.InstanceContainer import InstanceContainer # The new profile to make. +from cura.CuraApplication import CuraApplication from cura.ReaderWriters.ProfileReader import ProfileReader import zipfile @@ -111,9 +112,10 @@ class CuraProfileReader(ProfileReader): if "general" not in parser: Logger.log("w", "Missing required section 'general'.") return [] - if "version" not in parser["general"]: - Logger.log("w", "Missing required 'version' property") - return [] + + new_source_version = results.version + if int(new_source_version / 1000000) != InstanceContainer.Version or new_source_version % 1000000 != CuraApplication.SettingVersion: + Logger.log("e", "Failed to upgrade profile [%s]", profile_id) if int(parser["general"]["version"]) != InstanceContainer.Version: Logger.log("e", "Failed to upgrade profile [%s]", profile_id)