3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 15:37:27 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix crash of toolbox when metadata got corrupted

Browse source
This commit is contained in:
Jaime van Kessel 2018-11-07 12:03:32 +01:00
parent fad8ad5d47
commit 9a93f6866a
1 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

38
plugins/Toolbox/src/Toolbox.py
View file

@ -265,21 +265,25 @@ class Toolbox(QObject, Extension):
raise Exception("Failed to create Marketplace dialog") raise Exception("Failed to create Marketplace dialog")
return dialog return dialog
def _convertPluginMetadata(self, plugin: Dict[str, Any]) -> Dict[str, Any]: def _convertPluginMetadata(self, plugin_data: Dict[str, Any]) -> Optional[Dict[str, Any]]:
formatted = { try:
"package_id": plugin["id"], formatted = {
"package_type": "plugin", "package_id": plugin_data["id"],
"display_name": plugin["plugin"]["name"], "package_type": "plugin",
"package_version": plugin["plugin"]["version"], "display_name": plugin_data["plugin"]["name"],
"sdk_version": plugin["plugin"]["api"], "package_version": plugin_data["plugin"]["version"],
"author": { "sdk_version": plugin_data["plugin"]["api"],
"author_id": plugin["plugin"]["author"], "author": {
"display_name": plugin["plugin"]["author"] "author_id": plugin_data["plugin"]["author"],
}, "display_name": plugin_data["plugin"]["author"]
"is_installed": True, },
"description": plugin["plugin"]["description"] "is_installed": True,
} "description": plugin_data["plugin"]["description"]
return formatted }
return formatted
except:
Logger.log("w", "Unable to convert plugin meta data %s", str(plugin_data))
return None
@pyqtSlot() @pyqtSlot()
def _updateInstalledModels(self) -> None: def _updateInstalledModels(self) -> None:
@ -299,7 +303,9 @@ class Toolbox(QObject, Extension):
old_metadata = self._plugin_registry.getMetaData(plugin_id) old_metadata = self._plugin_registry.getMetaData(plugin_id)
new_metadata = self._convertPluginMetadata(old_metadata) new_metadata = self._convertPluginMetadata(old_metadata)
if new_metadata is None:
# Something went wrong converting it.
continue
self._old_plugin_ids.add(plugin_id) self._old_plugin_ids.add(plugin_id)
self._old_plugin_metadata[new_metadata["package_id"]] = new_metadata self._old_plugin_metadata[new_metadata["package_id"]] = new_metadata