3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

renamed locally_installed property

Browse source 
Contributes to: CURA-8587
This commit is contained in:
Jelle Spijker 2021-12-05 16:23:23 +01:00
parent bd2f270803
commit 305fb4ab09
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
3 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cura/CuraPackageManager.py
View file

@ -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)

5
plugins/Marketplace/LocalPackageList.py
View file

@ -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

4
plugins/Marketplace/RemotePackageList.py
View file

@ -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)