Use the ongoing_request queue

Contributes to CURA-8587
This commit is contained in:
Jelle Spijker 2021-12-10 12:41:37 +01:00
parent a571e87553
commit 11c2ccd227
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A

View file

@ -1,5 +1,5 @@
# Copyright (c) 2021 Ultimaker B.V. # Copyright (c) 2021 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot
from PyQt5.QtNetwork import QNetworkReply from PyQt5.QtNetwork import QNetworkReply
@ -131,7 +131,7 @@ class RemotePackageList(PackageList):
return return
self._request_url = response_data["links"].get("next", "") # Use empty string to signify that there is no next page. self._request_url = response_data["links"].get("next", "") # Use empty string to signify that there is no next page.
self._ongoing_request = None self._ongoing_requests["get_packages"] = None
self.setIsLoading(False) self.setIsLoading(False)
self.setHasMore(self._request_url != "") self.setHasMore(self._request_url != "")
@ -143,9 +143,9 @@ class RemotePackageList(PackageList):
""" """
if error == QNetworkReply.NetworkError.OperationCanceledError: if error == QNetworkReply.NetworkError.OperationCanceledError:
Logger.debug("Cancelled request for packages.") Logger.debug("Cancelled request for packages.")
self._ongoing_request = None self._ongoing_requests["get_packages"] = None
return # Don't show an error about this to the user. return # Don't show an error about this to the user.
Logger.error("Could not reach Marketplace server.") Logger.error("Could not reach Marketplace server.")
self.setErrorMessage(catalog.i18nc("@info:error", "Could not reach Marketplace.")) self.setErrorMessage(catalog.i18nc("@info:error", "Could not reach Marketplace."))
self._ongoing_request = None self._ongoing_requests["get_packages"] = None
self.setIsLoading(False) self.setIsLoading(False)