diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index fcbf5f6ea6..535d331a62 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -20,12 +20,12 @@ 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_id: Optional[Set[str]] = None + self._local_packages_ids: Optional[Set[str]] = None self.installedPackagesChanged.connect(self._updateLocalPackages) def _updateLocalPackages(self) -> None: self._local_packages = self.getAllLocalPackages() - self._local_packages_id = set(pkg["package_id"] for pkg in self._local_packages) + self._local_packages_ids = set(pkg["package_id"] for pkg in self._local_packages) @property def local_packages(self) -> List[Dict[str, Any]]: @@ -37,13 +37,13 @@ class CuraPackageManager(PackageManager): return cast(List[Dict[str, Any]], self._local_packages) @property - def local_packages_id(self) -> Set[str]: + def local_packages_ids(self) -> Set[str]: """locally installed packages, lazy execution""" - if self._local_packages_id is None: + if self._local_packages_ids 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_id) + return cast(Set[str], self._local_packages_ids) def initialize(self) -> None: self._installation_dirs_dict["materials"] = Resources.getStoragePath(CuraApplication.ResourceTypes.MaterialInstanceContainer) diff --git a/plugins/Marketplace/PackageModel.py b/plugins/Marketplace/PackageModel.py index de2732f147..0e808dd369 100644 --- a/plugins/Marketplace/PackageModel.py +++ b/plugins/Marketplace/PackageModel.py @@ -353,7 +353,7 @@ class PackageModel(QObject): @pyqtProperty(bool, notify = stateManageButtonChanged) def isInstalled(self) -> bool: - return self._package_id in self._package_manager.local_packages_id + return self._package_id in self._package_manager.local_packages_ids @pyqtProperty(bool, notify = stateManageButtonChanged) def isActive(self) -> bool: