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

Revert "Show install button after package has been uninstalled"

Browse source 
This reverts commit c66e17dd9e.
This commit is contained in:
Jelle Spijker 2021-12-15 16:38:54 +01:00
parent c66e17dd9e
commit 9e1e98bdbd
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
2 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

32
cura/CuraPackageManager.py
View file

@ -19,23 +19,11 @@ if TYPE_CHECKING:
class CuraPackageManager(PackageManager): class CuraPackageManager(PackageManager):
def __init__(self, application: "QtApplication", parent: Optional["QObject"] = None) -> None: def __init__(self, application: "QtApplication", parent: Optional["QObject"] = None) -> None:
super().__init__(application, parent) super().__init__(application, parent)
self._local_packages: Optional[Dict[str, Dict[str, Any]]] = None self._local_packages: Optional[Dict[str, Dict[str, Any]]] = None
self._local_packages_installed: Optional[Dict[str, Dict[str, Any]]] = None
self._local_packages_to_remove: Optional[Dict[str, Dict[str, Any]]] = None
self._local_packages_to_install: Optional[Dict[str, Dict[str, Any]]] = None
self.installedPackagesChanged.connect(self._updateLocalPackages) self.installedPackagesChanged.connect(self._updateLocalPackages)
def _updateLocalPackages(self) -> None: def _updateLocalPackages(self) -> None:
self._local_packages_installed = dict([(package_info["package_id"], dict(package_info)) for package in self.getAllInstalledPackagesInfo().values() for package_info in package]) self._local_packages = self.getAllLocalPackages()
self._local_packages_to_remove = dict([(package["package_info"]["package_id"], dict(package["package_info"])) for package in self.getPackagesToRemove().values()])
self._local_packages_to_install = dict([(package["package_info"]["package_id"], dict(package["package_info"])) for package in self.getPackagesToInstall().values()])
self._local_packages = {}
self._local_packages.update(self._local_packages_installed)
self._local_packages.update(self._local_packages_to_remove)
self._local_packages.update(self._local_packages_to_install)
@property @property
def local_packages(self) -> List[Dict[str, Any]]: def local_packages(self) -> List[Dict[str, Any]]:
@ -55,15 +43,6 @@ class CuraPackageManager(PackageManager):
# It's guaranteed to be a list now. # It's guaranteed to be a list now.
return set(self._local_packages.keys()) return set(self._local_packages.keys())
@property
def installed_packages_ids(self) -> Set[str]:
"""locally installed packages, lazy execution"""
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 set(self._local_packages_installed.keys())
def initialize(self) -> None: def initialize(self) -> None:
self._installation_dirs_dict["materials"] = Resources.getStoragePath(CuraApplication.ResourceTypes.MaterialInstanceContainer) self._installation_dirs_dict["materials"] = Resources.getStoragePath(CuraApplication.ResourceTypes.MaterialInstanceContainer)
self._installation_dirs_dict["qualities"] = Resources.getStoragePath(CuraApplication.ResourceTypes.QualityInstanceContainer) self._installation_dirs_dict["qualities"] = Resources.getStoragePath(CuraApplication.ResourceTypes.QualityInstanceContainer)
@ -93,3 +72,12 @@ class CuraPackageManager(PackageManager):
machine_with_qualities.append((global_stack, str(extruder_nr), container_id)) machine_with_qualities.append((global_stack, str(extruder_nr), container_id))
return machine_with_materials, machine_with_qualities return machine_with_materials, machine_with_qualities
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()])
return packages

2
plugins/Marketplace/PackageModel.py
View file

@ -351,7 +351,7 @@ class PackageModel(QObject):
@pyqtProperty(bool, notify = stateManageButtonChanged) @pyqtProperty(bool, notify = stateManageButtonChanged)
def isInstalled(self) -> bool: def isInstalled(self) -> bool:
return self._package_id in self._package_manager.installed_packages_ids return self._package_id in self._package_manager.local_packages_ids
@pyqtProperty(bool, notify = stateManageButtonChanged) @pyqtProperty(bool, notify = stateManageButtonChanged)
def isActive(self) -> bool: def isActive(self) -> bool: