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

Added error handling when downloading packages failed

Browse source 
A simple callback function which ensures that the proper signals
are emitted when we fail to retrieve the package.

Contributes to: CURA-8587
This commit is contained in:
Jelle Spijker 2021-12-03 15:50:51 +01:00
parent e37f08790f
commit a83a598e96
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
1 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
plugins/Marketplace/PackageList.py
View file

@ -129,10 +129,14 @@ class PackageList(ListModel):
def downloadFinished(reply: "QNetworkReply") -> None: def downloadFinished(reply: "QNetworkReply") -> None:
self._downloadFinished(package_id, reply, update) self._downloadFinished(package_id, reply, update)
self._ongoing_request = HttpRequestManager.getInstance().get( def downloadError(reply: "QNetworkReply", error: "QNetworkReply.NetworkError") -> None:
self._downloadError(package_id, update, reply, error)
HttpRequestManager.getInstance().get(
url, url,
scope = self._scope, scope = self._scope,
callback = downloadFinished callback = downloadFinished,
error_callback = downloadError
) )
def _downloadFinished(self, package_id: str, reply: "QNetworkReply", update: bool = False) -> None: def _downloadFinished(self, package_id: str, reply: "QNetworkReply", update: bool = False) -> None:
@ -146,8 +150,19 @@ class PackageList(ListModel):
self._to_install[package_id] = temp_file.name self._to_install[package_id] = temp_file.name
self.canInstallChanged.emit(package_id, update) self.canInstallChanged.emit(package_id, update)
except IOError as e: except IOError as e:
Logger.logException("e", "Failed to write downloaded package to temp file", e) Logger.error(f"Failed to write downloaded package to temp file {e}")
temp_file.close() temp_file.close()
self._downloadError(package_id, update)
def _downloadError(self, package_id: str, update: bool = False, reply: Optional["QNetworkReply"] = None, error: Optional["QNetworkReply.NetworkError"] = None) -> None:
if reply:
reply_string = bytes(reply.readAll()).decode()
Logger.error(f"Failed to download package: {package_id} due to {reply_string}")
package = self._getPackageModel(package_id)
if update:
package.setIsUpdating(False)
else:
package.setIsInstalling(False)
@pyqtSlot(str) @pyqtSlot(str)
def installPackage(self, package_id: str) -> None: def installPackage(self, package_id: str) -> None:
@ -168,7 +183,7 @@ class PackageList(ListModel):
package.setIsUpdating(False) package.setIsUpdating(False)
else: else:
package.setIsInstalling(False) package.setIsInstalling(False)
#self._subscribe(package_id) # self._subscribe(package_id)
def _subscribe(self, package_id: str) -> None: def _subscribe(self, package_id: str) -> None:
if self._account.isLoggedIn: if self._account.isLoggedIn: