From 33f1bd8c5d2126e0f3045d9c71514dd23788f9c9 Mon Sep 17 00:00:00 2001
From: casper <c.lamboo@ultimaker.com>
Date: Wed, 15 Dec 2021 14:18:40 +0100
Subject: [PATCH] Simplify `CuraPackageManager`

CURA-8587
---
 cura/CuraPackageManager.py | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py
index 535d331a62..313653c8a0 100644
--- a/cura/CuraPackageManager.py
+++ b/cura/CuraPackageManager.py
@@ -19,13 +19,11 @@ if TYPE_CHECKING:
 class CuraPackageManager(PackageManager):
     def __init__(self, application: "QtApplication", parent: Optional["QObject"] = None) -> None:
         super().__init__(application, parent)
-        self._local_packages: Optional[List[Dict[str, Any]]] = None
-        self._local_packages_ids: Optional[Set[str]] = None
+        self._local_packages: Optional[Dict[str, Dict[str, Any]]] = None
         self.installedPackagesChanged.connect(self._updateLocalPackages)
 
     def _updateLocalPackages(self) -> None:
         self._local_packages = self.getAllLocalPackages()
-        self._local_packages_ids = set(pkg["package_id"] for pkg in self._local_packages)
 
     @property
     def local_packages(self) -> List[Dict[str, Any]]:
@@ -34,16 +32,16 @@ class CuraPackageManager(PackageManager):
             self._updateLocalPackages()
             # _updateLocalPackages always results in a list of packages, not None.
             # It's guaranteed to be a list now.
-        return cast(List[Dict[str, Any]], self._local_packages)
+        return list(self._local_packages.values())
 
     @property
     def local_packages_ids(self) -> Set[str]:
         """locally installed packages, lazy execution"""
-        if self._local_packages_ids is None:
+        if self._local_packages is None:
             self._updateLocalPackages()
             # _updateLocalPackages always results in a list of packages, not None.
             # It's guaranteed to be a list now.
-        return cast(Set[str], self._local_packages_ids)
+        return set(self._local_packages.keys())
 
     def initialize(self) -> None:
         self._installation_dirs_dict["materials"] = Resources.getStoragePath(CuraApplication.ResourceTypes.MaterialInstanceContainer)
@@ -75,17 +73,11 @@ class CuraPackageManager(PackageManager):
 
         return machine_with_materials, machine_with_qualities
 
-    def getAllLocalPackages(self) -> List[Dict[str, Any]]:
+    def getAllLocalPackages(self) -> Dict[str, Dict[str, Any]]:
         """ returns an unordered list of all the package_info installed, to be installed or to be returned"""
 
+        packages = dict([(package_info["package_id"], dict(package_info)) for package in self.getAllInstalledPackagesInfo().values() for package_info in package])
+        packages.update([(package["package_info"]["package_id"], dict(package["package_info"])) for package in self.getPackagesToRemove().values()])
+        packages.update([(package["package_info"]["package_id"], dict(package["package_info"])) for package in self.getPackagesToInstall().values()])
 
-        class PkgInfo(dict):
-            # Needed helper class because a dict isn't hashable
-            def __eq__(self, item):
-                return item == self["package_id"]
-
-        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 packages