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

Further simplify the data being sent over to the package manager

Browse Source 
CURA-8587
This commit is contained in:
Jaime van Kessel 2021-12-16 23:21:44 +01:00
parent fa7ad7ddb1
commit 477f62916c
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cura/CuraPackageManager.py
View File

@ -85,7 +85,4 @@ class CuraPackageManager(PackageManager):
return item == self["package_id"] return item == self["package_id"]
packages = [PkgInfo(package_info) for package in self.getAllInstalledPackagesInfo().values() for package_info in package] packages = [PkgInfo(package_info) for package in self.getAllInstalledPackagesInfo().values() for package_info in package]
packages.extend([PkgInfo(package["package_info"]) for package in self.getPackagesToRemove().values() if package["package_info"]["package_id"] not in packages])
packages.extend([PkgInfo(package["package_info"]) for package in self.getPackagesToInstall().values() if package["package_info"]["package_id"] not in packages])
return [dict(package) for package in packages] return [dict(package) for package in packages]

6
plugins/Marketplace/LocalPackageList.py
View File

@ -49,7 +49,7 @@ class LocalPackageList(PackageList):
def _removePackageModel(self, package_id): def _removePackageModel(self, package_id):
package = self.getPackageModel(package_id) package = self.getPackageModel(package_id)
if not package.canUpdate and package_id in self._package_manager.getPackagesToRemove() and package_id not in self._package_manager.getPackagesToInstall(): if not package.canUpdate and package_id in self._package_manager.getToRemovePackageIDs() and package_id not in self._package_manager.getPackagesToInstall():
index = self.find("package", package_id) index = self.find("package", package_id)
if index < 0: if index < 0:
Logger.error(f"Could not find card in Listview corresponding with {package_id}") Logger.error(f"Could not find card in Listview corresponding with {package_id}")
@ -110,5 +110,7 @@ class LocalPackageList(PackageList):
return return
packages = response_data["data"] packages = response_data["data"]
self._package_manager.setPackagesWithUpdate(dict(zip([p['package_id'] for p in packages], [p for p in packages])))
self._package_manager.setPackagesWithUpdate({p['package_id'] for p in packages})
self._ongoing_requests["check_updates"] = None self._ongoing_requests["check_updates"] = None

2
plugins/Toolbox/src/Toolbox.py
View File

@ -635,7 +635,7 @@ class Toolbox(QObject, Extension):
elif request_type == "updates": elif request_type == "updates":
# Tell the package manager that there's a new set of updates available. # Tell the package manager that there's a new set of updates available.
packages = self._server_response_data[request_type] packages = self._server_response_data[request_type]
self._package_manager.setPackagesWithUpdate(dict(zip([p['package_id'] for p in packages], [p for p in packages]))) self._package_manager.setPackagesWithUpdate({p['package_id'] for p in packages})
self.metadataChanged.emit() self.metadataChanged.emit()