GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 03:49:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

CURA-5035 Crash because old packages don't have 'author_id'

Browse Source
This commit is contained in:
Ian Paschal 2018-05-01 10:45:22 +02:00
parent 51abd32328
commit 096f304aef
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cura/CuraPackageManager.py
View File

@ -158,21 +158,23 @@ class CuraPackageManager(QObject):
return installed_packages_dict return installed_packages_dict
def __convertPluginMetadataToPackageMetadata(self, plugin_metadata: dict) -> dict: def __convertPluginMetadataToPackageMetadata(self, plugin_metadata: dict) -> dict:
package_metadata = {"package_id": plugin_metadata["id"], package_metadata = {
"package_type": "plugin", "package_id": plugin_metadata["id"],
"display_name": plugin_metadata["plugin"]["name"], "package_type": "plugin",
"description": plugin_metadata["plugin"].get("description"), "display_name": plugin_metadata["plugin"]["name"],
"package_version": plugin_metadata["plugin"]["version"], "description": plugin_metadata["plugin"].get("description"),
"cura_version": int(plugin_metadata["plugin"]["api"]), "package_version": plugin_metadata["plugin"]["version"],
"website": "", "cura_version": int(plugin_metadata["plugin"]["api"]),
"author": { "website": "",
"author_id": plugin_metadata["plugin"].get("author", ""), "author_id": plugin_metadata["plugin"].get("author", "UnknownID"),
"display_name": plugin_metadata["plugin"].get("author", ""), "author": {
"email": "", "author_id": plugin_metadata["plugin"].get("author", "UnknownID"),
"website": "", "display_name": plugin_metadata["plugin"].get("author", ""),
}, "email": "",
"tags": ["plugin"], "website": "",
} },
"tags": ["plugin"],
}
return package_metadata return package_metadata
# Checks if the given package is installed. # Checks if the given package is installed.

2
plugins/Toolbox/resources/qml/ToolboxDetailList.qml
View File

@ -23,7 +23,7 @@ Item
bottomMargin: UM.Theme.getSize("wide_margin").height bottomMargin: UM.Theme.getSize("wide_margin").height
top: parent.top top: parent.top
} }
height: childrenRect.height + UM.Theme.getSize("wide_margin").height height: childrenRect.height + 2 * UM.Theme.getSize("wide_margin").height
spacing: UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("default_margin").height
Repeater Repeater
{ {

5
plugins/Toolbox/src/PackagesModel.py
View File

@ -43,13 +43,14 @@ class PackagesModel(ListModel):
items = [] items = []
for package in self._metadata: for package in self._metadata:
print(package["author"])
items.append({ items.append({
"id": package["package_id"], "id": package["package_id"],
"type": package["package_type"], "type": package["package_type"],
"name": package["display_name"], "name": package["display_name"],
"version": package["package_version"], "version": package["package_version"],
"author_id": package["author"]["author_id"], "author_id": package["author"]["author_id"] if "author_id" in package["author"] else package["author"]["name"],
"author_name": package["author"]["display_name"], "author_name": package["author"]["display_name"] if "display_name" in package["author"] else package["author"]["name"],
"author_email": package["author"]["email"] if "email" in package["author"] else "None", "author_email": package["author"]["email"] if "email" in package["author"] else "None",
"description": package["description"], "description": package["description"],
"icon_url": package["icon_url"] if "icon_url" in package else None, "icon_url": package["icon_url"] if "icon_url" in package else None,