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 _manager to _package_manager for more consistent naming

Browse source 
Contributes to CURA-8587
This commit is contained in:
Jelle Spijker 2021-12-16 10:06:54 +01:00
parent 23cc7084c4
commit 951c0234d6
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
2 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/Marketplace/LocalPackageList.py
View file

@ -40,7 +40,7 @@ class LocalPackageList(PackageList):
super().__init__(parent) super().__init__(parent)
self._has_footer = False self._has_footer = False
self._ongoing_requests["check_updates"] = None self._ongoing_requests["check_updates"] = None
self._manager.packagesWithUpdateChanged.connect(self._sortSectionsOnUpdate) self._package_manager.packagesWithUpdateChanged.connect(self._sortSectionsOnUpdate)
def _sortSectionsOnUpdate(self) -> None: def _sortSectionsOnUpdate(self) -> None:
SECTION_ORDER = dict(zip([i for k, v in self.PACKAGE_CATEGORIES.items() for i in self.PACKAGE_CATEGORIES[k].values()], ["a", "b", "c", "d"])) SECTION_ORDER = dict(zip([i for k, v in self.PACKAGE_CATEGORIES.items() for i in self.PACKAGE_CATEGORIES[k].values()], ["a", "b", "c", "d"]))
@ -56,9 +56,9 @@ class LocalPackageList(PackageList):
self.setIsLoading(True) self.setIsLoading(True)
# Obtain and sort the local packages # Obtain and sort the local packages
self.setItems([{"package": p} for p in [self._makePackageModel(p) for p in self._manager.local_packages]]) self.setItems([{"package": p} for p in [self._makePackageModel(p) for p in self._package_manager.local_packages]])
self._sortSectionsOnUpdate() self._sortSectionsOnUpdate()
self.checkForUpdates(self._manager.local_packages) self.checkForUpdates(self._package_manager.local_packages)
self.setIsLoading(False) self.setIsLoading(False)
self.setHasMore(False) # All packages should have been loaded at this time self.setHasMore(False) # All packages should have been loaded at this time
@ -67,7 +67,7 @@ class LocalPackageList(PackageList):
""" Create a PackageModel from the package_info and determine its section_title""" """ Create a PackageModel from the package_info and determine its section_title"""
package_id = package_info["package_id"] package_id = package_info["package_id"]
bundled_or_installed = "bundled" if self._manager.isBundledPackage(package_id) else "installed" bundled_or_installed = "bundled" if self._package_manager.isBundledPackage(package_id) else "installed"
package_type = package_info["package_type"] package_type = package_info["package_type"]
section_title = self.PACKAGE_CATEGORIES[bundled_or_installed][package_type] section_title = self.PACKAGE_CATEGORIES[bundled_or_installed][package_type]
package = PackageModel(package_info, section_title = section_title, parent = self) package = PackageModel(package_info, section_title = section_title, parent = self)
@ -99,5 +99,5 @@ class LocalPackageList(PackageList):
return return
packages = response_data["data"] packages = response_data["data"]
self._manager.setPackagesWithUpdate(dict(zip([p['package_id'] for p in packages], [p for p in packages]))) self._package_manager.setPackagesWithUpdate(dict(zip([p['package_id'] for p in packages], [p for p in packages])))
self._ongoing_requests["check_updates"] = None self._ongoing_requests["check_updates"] = None

19
plugins/Marketplace/PackageList.py
View file

@ -37,7 +37,7 @@ class PackageList(ListModel):
def __init__(self, parent: Optional["QObject"] = None) -> None: def __init__(self, parent: Optional["QObject"] = None) -> None:
super().__init__(parent) super().__init__(parent)
self._manager: CuraPackageManager = cast(CuraPackageManager, CuraApplication.getInstance().getPackageManager()) self._package_manager: CuraPackageManager = cast(CuraPackageManager, CuraApplication.getInstance().getPackageManager())
self._plugin_registry: PluginRegistry = CuraApplication.getInstance().getPluginRegistry() self._plugin_registry: PluginRegistry = CuraApplication.getInstance().getPluginRegistry()
self._account = CuraApplication.getInstance().getCuraAPI().account self._account = CuraApplication.getInstance().getCuraAPI().account
self._error_message = "" self._error_message = ""
@ -47,7 +47,7 @@ class PackageList(ListModel):
self._has_footer = True self._has_footer = True
self._to_install: Dict[str, str] = {} self._to_install: Dict[str, str] = {}
self.canInstallChanged.connect(self._requestInstall) self.canInstallChanged.connect(self._requestInstall)
self._local_packages: Set[str] = {p["package_id"] for p in self._manager.local_packages} self._local_packages: Set[str] = {p["package_id"] for p in self._package_manager.local_packages}
self._ongoing_requests: Dict[str, Optional[HttpRequestData]] = {"download_package": None} self._ongoing_requests: Dict[str, Optional[HttpRequestData]] = {"download_package": None}
self._scope = JsonDecoratorScope(UltimakerCloudScope(CuraApplication.getInstance())) self._scope = JsonDecoratorScope(UltimakerCloudScope(CuraApplication.getInstance()))
@ -165,11 +165,11 @@ class PackageList(ListModel):
if dialog is not None: if dialog is not None:
dialog.deleteLater() dialog.deleteLater()
# reset package card # reset package card
self._manager.packageInstallingFailed.emit(package_id) self._package_manager.packageInstallingFailed.emit(package_id)
def _requestInstall(self, package_id: str, update: bool = False) -> None: def _requestInstall(self, package_id: str, update: bool = False) -> None:
package_path = self._to_install[package_id] package_path = self._to_install[package_id]
license_content = self._manager.getPackageLicense(package_path) license_content = self._package_manager.getPackageLicense(package_path)
if not update and license_content is not None: if not update and license_content is not None:
# If installation is not and update, and the packages contains a license then # If installation is not and update, and the packages contains a license then
@ -181,8 +181,9 @@ class PackageList(ListModel):
def _install(self, package_id: str, update: bool = False) -> None: def _install(self, package_id: str, update: bool = False) -> None:
package_path = self._to_install.pop(package_id) package_path = self._to_install.pop(package_id)
to_be_installed = self._manager.installPackage(package_path) is not None to_be_installed = self._package_manager.installPackage(package_path) is not None
if not to_be_installed: if not to_be_installed:
Logger.warning(f"Could not install {package_id}")
return return
package = self.getPackageModel(package_id) package = self.getPackageModel(package_id)
self.subscribeUserToPackage(package_id, str(package.sdk_version)) self.subscribeUserToPackage(package_id, str(package.sdk_version))
@ -237,7 +238,7 @@ class PackageList(ListModel):
if reply: if reply:
reply_string = bytes(reply.readAll()).decode() reply_string = bytes(reply.readAll()).decode()
Logger.error(f"Failed to download package: {package_id} due to {reply_string}") Logger.error(f"Failed to download package: {package_id} due to {reply_string}")
self._manager.packageInstallingFailed.emit(package_id) self._package_manager.packageInstallingFailed.emit(package_id)
def subscribeUserToPackage(self, package_id: str, sdk_version: str) -> None: def subscribeUserToPackage(self, package_id: str, sdk_version: str) -> None:
"""Subscribe the user (if logged in) to the package for a given SDK """Subscribe the user (if logged in) to the package for a given SDK
@ -279,7 +280,7 @@ class PackageList(ListModel):
:param package_id: the package identification string :param package_id: the package identification string
""" """
self._manager.removePackage(package_id) self._package_manager.removePackage(package_id)
self.unsunscribeUserFromPackage(package_id) self.unsunscribeUserFromPackage(package_id)
def updatePackage(self, package_id: str) -> None: def updatePackage(self, package_id: str) -> None:
@ -287,6 +288,6 @@ class PackageList(ListModel):
:param package_id: the package identification string :param package_id: the package identification string
""" """
self._manager.removePackage(package_id, force_add = not self._manager.isBundledPackage(package_id)) self._package_manager.removePackage(package_id, force_add = not self._package_manager.isBundledPackage(package_id))
url = self._manager.package_infosWithUpdate[package_id]["download_url"] url = self._package_manager.package_infosWithUpdate[package_id]["download_url"]
self.download(package_id, url, True) self.download(package_id, url, True)