From 9a08e0cc270d54bd9caff96fc823ba88d72eea58 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 23 May 2017 11:51:28 +0200 Subject: [PATCH] Only use for detecting material file version CURA-3540 --- .../XmlMaterialProfile/XmlMaterialProfile.py | 18 +----------------- .../XmlMaterialProfile/XmlMaterialUpgrader.py | 18 +----------------- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index bddb801030..7519565302 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -395,29 +395,13 @@ class XmlMaterialProfile(InstanceContainer): def getVersionFromSerialized(self, serialized: str) -> Optional[int]: data = ET.fromstring(serialized) - # get format version - version = None - metadata = data.iterfind("./um:metadata/*", self.__namespaces) - for entry in metadata: - tag_name = _tag_without_namespace(entry) - if tag_name == "version": - try: - version = int(entry.text) - except Exception as e: - raise InvalidInstanceError("Invalid version string '%s': %s" % (entry.text, e)) - break - if version is None: - raise InvalidInstanceError("Missing version in metadata") - + version = 1 # get setting version if "version" in data.attrib: setting_version = self.xmlVersionToSettingVersion(data.attrib["version"]) else: setting_version = self.xmlVersionToSettingVersion("1.2") - if version is None: - raise InvalidInstanceError("Missing version in metadata") - return version * 1000000 + setting_version ## Overridden from InstanceContainer diff --git a/plugins/XmlMaterialProfile/XmlMaterialUpgrader.py b/plugins/XmlMaterialProfile/XmlMaterialUpgrader.py index 8f1d1e9ec6..ad20a44c28 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialUpgrader.py +++ b/plugins/XmlMaterialProfile/XmlMaterialUpgrader.py @@ -10,29 +10,13 @@ class XmlMaterialUpgrader(VersionUpgrade): def getXmlVersion(self, serialized): data = ET.fromstring(serialized) - # get format version - version = None - metadata = data.iterfind("./um:metadata/*") - for entry in metadata: - tag_name = entry.tag - if tag_name == "version": - try: - version = int(entry.text) - except Exception as e: - raise ValueError("Invalid version string '%s': %s" % (entry.text, e)) - break - if version is None: - raise RuntimeError("Missing version in metadata") - + version = 1 # get setting version if "version" in data.attrib: setting_version = self._xmlVersionToSettingVersion(data.attrib["version"]) else: setting_version = self._xmlVersionToSettingVersion("1.2") - if version is None: - raise RuntimeError("Missing version in metadata") - return version * 1000000 + setting_version def _xmlVersionToSettingVersion(self, xml_version: str) -> int: