mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-06 22:47:29 -06:00
Clean up the package manager a bit:
- Remove an unused method. - Safely check if the plugin info exist
This commit is contained in:
parent
6f402c9ea9
commit
7d725936ef
1 changed files with 7 additions and 30 deletions
|
@ -130,7 +130,6 @@ class CuraPackageManager(QObject):
|
|||
return None
|
||||
|
||||
def getAllInstalledPackagesInfo(self) -> dict:
|
||||
|
||||
# Add bundled, installed, and to-install packages to the set of installed package IDs
|
||||
all_installed_ids = set()
|
||||
|
||||
|
@ -150,6 +149,7 @@ class CuraPackageManager(QObject):
|
|||
if package_id in Application.getInstance().getRequiredPlugins():
|
||||
continue
|
||||
|
||||
package_info = None
|
||||
# Add bundled plugins
|
||||
if package_id in self._bundled_package_dict:
|
||||
package_info = self._bundled_package_dict[package_id]["package_info"]
|
||||
|
@ -162,17 +162,14 @@ class CuraPackageManager(QObject):
|
|||
if package_id in self._to_install_package_dict:
|
||||
package_info = self._to_install_package_dict[package_id]["package_info"]
|
||||
|
||||
if package_info is None:
|
||||
continue
|
||||
|
||||
# We also need to get information from the plugin registry such as if a plugin is active
|
||||
if package_info["package_type"] == "plugin":
|
||||
package_info["is_active"] = self._plugin_registry.isActivePlugin(package_id)
|
||||
else:
|
||||
package_info["is_active"] = self._plugin_registry.isActivePlugin(package_id)
|
||||
|
||||
# If the package ID is in bundled, label it as such
|
||||
if package_info["package_id"] in self._bundled_package_dict.keys():
|
||||
package_info["is_bundled"] = True
|
||||
else:
|
||||
package_info["is_bundled"] = False
|
||||
package_info["is_bundled"] = package_info["package_id"] in self._bundled_package_dict.keys()
|
||||
|
||||
# If there is not a section in the dict for this type, add it
|
||||
if package_info["package_type"] not in installed_packages_dict:
|
||||
|
@ -183,26 +180,6 @@ class CuraPackageManager(QObject):
|
|||
|
||||
return installed_packages_dict
|
||||
|
||||
def __convertPluginMetadataToPackageMetadata(self, plugin_metadata: dict) -> dict:
|
||||
package_metadata = {
|
||||
"package_id": plugin_metadata["id"],
|
||||
"package_type": "plugin",
|
||||
"display_name": plugin_metadata["plugin"]["name"],
|
||||
"description": plugin_metadata["plugin"].get("description"),
|
||||
"package_version": plugin_metadata["plugin"]["version"],
|
||||
"cura_version": int(plugin_metadata["plugin"]["api"]),
|
||||
"website": "",
|
||||
"author_id": plugin_metadata["plugin"].get("author", "UnknownID"),
|
||||
"author": {
|
||||
"author_id": plugin_metadata["plugin"].get("author", "UnknownID"),
|
||||
"display_name": plugin_metadata["plugin"].get("author", ""),
|
||||
"email": "",
|
||||
"website": "",
|
||||
},
|
||||
"tags": ["plugin"]
|
||||
}
|
||||
return package_metadata
|
||||
|
||||
# Checks if the given package is installed.
|
||||
def isPackageInstalled(self, package_id: str) -> bool:
|
||||
return self.getInstalledPackageInfo(package_id) is not None
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue