Browse Source

renamed locally_installed property

Contributes to: CURA-8587
Jelle Spijker 3 years ago
parent
commit
305fb4ab09

+ 8 - 12
cura/CuraPackageManager.py

@@ -19,22 +19,18 @@ if TYPE_CHECKING:
 class CuraPackageManager(PackageManager):
     def __init__(self, application: "QtApplication", parent: Optional["QObject"] = None) -> None:
         super().__init__(application, parent)
-        self._locally_installed_packages = None
-        self.installedPackagesChanged.connect(self._updateLocallyInstalledPackages)
+        self._local_packages: Optional[List[Dict[str, Any]]] = None
+        self.installedPackagesChanged.connect(self._updateLocalPackages)
 
-    def _updateLocallyInstalledPackages(self):
-        self._locally_installed_packages = self.getAllLocalPackages()
+    def _updateLocalPackages(self) -> None:
+        self._local_packages = self.getAllLocalPackages()
 
     @property
-    def locally_installed_packages(self):
+    def local_packages(self) -> List[Dict[str, Any]]:
         """locally installed packages, lazy execution"""
-        if self._locally_installed_packages is None:
-            self._updateLocallyInstalledPackages()
-        return self._locally_installed_packages
-
-    @locally_installed_packages.setter
-    def locally_installed_packages(self, value):
-        self._locally_installed_packages = value
+        if self._local_packages is None:
+            self._updateLocalPackages()
+        return self._local_packages
 
     def initialize(self) -> None:
         self._installation_dirs_dict["materials"] = Resources.getStoragePath(CuraApplication.ResourceTypes.MaterialInstanceContainer)

+ 3 - 2
plugins/Marketplace/LocalPackageList.py

@@ -48,9 +48,10 @@ class LocalPackageList(PackageList):
         self.setIsLoading(True)
 
         # Obtain and sort the local packages
-        self.setItems([{"package": p} for p in [self._makePackageModel(p) for p in self._manager.locally_installed_packages]])
+        Logger.debug(f"Number of local packages: {len(self._manager.local_packages)} -> {[p['package_id'] for p in self._manager.local_packages]}")
+        self.setItems([{"package": p} for p in [self._makePackageModel(p) for p in self._manager.local_packages]])
         self.sort(attrgetter("sectionTitle", "canUpdate", "displayName"), key = "package", reverse = True)
-        self.checkForUpdates(self._manager.locally_installed_packages)
+        self.checkForUpdates(self._manager.local_packages)
 
         self.setIsLoading(False)
         self.setHasMore(False)  # All packages should have been loaded at this time

+ 2 - 2
plugins/Marketplace/RemotePackageList.py

@@ -31,7 +31,7 @@ class RemotePackageList(PackageList):
         self._request_url = self._initialRequestUrl()
         self.isLoadingChanged.connect(self._onLoadingChanged)
         self.isLoadingChanged.emit()
-        self._locally_installed: Set[str] = { p["package_id"] for p in self._manager.locally_installed_packages }
+        self._local_packages: Set[str] = { p["package_id"] for p in self._manager.local_packages }
 
     def __del__(self) -> None:
         """
@@ -129,7 +129,7 @@ class RemotePackageList(PackageList):
             return
 
         for package_data in response_data["data"]:
-            if package_data["package_id"] in self._locally_installed:
+            if package_data["package_id"] in self._local_packages:
                 continue  # We should only show packages which are not already installed
             try:
                 package = PackageModel(package_data, parent = self)