From e5c72cfdc5cef3d1cb995d5e9504e45fb94216c6 Mon Sep 17 00:00:00 2001 From: alekseisasin Date: Wed, 31 Jan 2018 14:58:44 +0100 Subject: [PATCH] Validate material profile CURA-4851 --- cura/Settings/ContainerManager.py | 5 +++-- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 6 ++++++ resources/qml/Preferences/MaterialsPage.qml | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 21fc3f43c0..aae4f5a23e 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -459,7 +459,7 @@ class ContainerManager(QObject): # \return \type{Dict} dict with a 'status' key containing the string 'success' or 'error', and a 'message' key # containing a message for the user @pyqtSlot(QUrl, result = "QVariantMap") - def importContainer(self, file_url_or_string: Union[QUrl, str]) -> Dict[str, str]: + def importMaterialContainer(self, file_url_or_string: Union[QUrl, str]) -> Dict[str, str]: if not file_url_or_string: return { "status": "error", "message": "Invalid path"} @@ -490,8 +490,9 @@ class ContainerManager(QObject): container.deserialize(f.read()) except PermissionError: return { "status": "error", "message": "Permission denied when trying to read the file"} + except Exception as ex: + return {"status": "error", "message": str(ex)} - container.setName(container_id) container.setDirty(True) self._container_registry.addContainer(container) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 18b043806c..cdbbd1839e 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -17,6 +17,8 @@ import UM.Dictionary from UM.Settings.InstanceContainer import InstanceContainer from UM.Settings.ContainerRegistry import ContainerRegistry +from .XmlMaterialValidator import XmlMaterialValidater + ## Handles serializing and deserializing material containers from an XML file class XmlMaterialProfile(InstanceContainer): CurrentFdmMaterialVersion = "1.3" @@ -480,6 +482,10 @@ class XmlMaterialProfile(InstanceContainer): if "adhesion_info" not in meta_data: meta_data["adhesion_info"] = "" + validation_message = XmlMaterialValidater.validateMaterialMetaDate(meta_data) + if validation_message is not None: + raise Exception("Not valid material profile: %s" % (validation_message)) + property_values = {} properties = data.iterfind("./um:properties/*", self.__namespaces) for entry in properties: diff --git a/resources/qml/Preferences/MaterialsPage.qml b/resources/qml/Preferences/MaterialsPage.qml index 228f9c8ea2..fa2c68ef36 100644 --- a/resources/qml/Preferences/MaterialsPage.qml +++ b/resources/qml/Preferences/MaterialsPage.qml @@ -301,7 +301,7 @@ UM.ManagementPage folder: CuraApplication.getDefaultPath("dialog_material_path") onAccepted: { - var result = Cura.ContainerManager.importContainer(fileUrl) + var result = Cura.ContainerManager.importMaterialContainer(fileUrl) messageDialog.title = catalog.i18nc("@title:window", "Import Material") messageDialog.text = catalog.i18nc("@info:status Don't translate the XML tags or !", "Could not import material %1: %2").arg(fileUrl).arg(result.message)