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

Moved busy/confirmed logic to QML

Browse source 
COntributes to CURA-8587
This commit is contained in:
Jelle Spijker 2021-12-10 17:38:20 +01:00
parent d876b85259
commit e72655cc22
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
3 changed files with 132 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/Marketplace/PackageList.py
View file

@ -165,7 +165,7 @@ class PackageList(ListModel):
if dialog is not None:
dialog.deleteLater()
# reset package card
package = self.getPackageModel(package_id)
self._manager.packageInstallingFailed.emit(package_id)
def _requestInstall(self, package_id: str, update: bool = False) -> None:
package_path = self._to_install[package_id]
@ -182,8 +182,9 @@ class PackageList(ListModel):
def _install(self, package_id: str, update: bool = False) -> None:
package_path = self._to_install.pop(package_id)
to_be_installed = self._manager.installPackage(package_path) is not None
if not to_be_installed:
return
package = self.getPackageModel(package_id)
# TODO handle failure
self.subscribeUserToPackage(package_id, str(package.sdk_version))
def download(self, package_id: str, url: str, update: bool = False) -> None:
@ -231,14 +232,7 @@ class PackageList(ListModel):
if reply:
reply_string = bytes(reply.readAll()).decode()
Logger.error(f"Failed to download package: {package_id} due to {reply_string}")
try:
package = self.getPackageModel(package_id)
# TODO: handle error
except RuntimeError:
# Setting the ownership of this object to not qml can still result in a RuntimeError. Which can occur when quickly toggling
# between de-/constructing Remote or Local PackageLists. This try-except is here to prevent a hard crash when the wrapped C++ object
# was deleted when it was still parsing the response
return
self._manager.packageInstallingFailed.emit(package_id)
def subscribeUserToPackage(self, package_id: str, sdk_version: str) -> None:
"""Subscribe the user (if logged in) to the package for a given SDK