3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 23:17:32 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Move HttpRequestManager to Uranium

Browse source 
CURA-6387
This commit is contained in:
Lipu Fei 2019-12-19 10:24:17 +01:00
parent 6fbce74523
commit 55d31b9846
4 changed files with 14 additions and 353 deletions
Download patch file Download diff file Expand all files Collapse all files

26
plugins/Toolbox/src/Toolbox.py
View file

@ -27,8 +27,8 @@ from .PackagesModel import PackagesModel
from .SubscribedPackagesModel import SubscribedPackagesModel
if TYPE_CHECKING:
from UM.TaskManagement.HttpRequestManager import HttpRequestData
from cura.Settings.GlobalStack import GlobalStack
from cura.TaskManagement.HttpNetworkRequestManager import HttpNetworkRequestData
i18n_catalog = i18nCatalog("cura")
@ -46,7 +46,7 @@ class Toolbox(QObject, Extension):
self._api_url = None # type: Optional[str]
# Network:
self._download_request_data = None # type: Optional[HttpNetworkRequestData]
self._download_request_data = None # type: Optional[HttpRequestData]
self._download_progress = 0 # type: float
self._is_downloading = False # type: bool
self._request_headers = dict() # type: Dict[str, str]
@ -162,8 +162,8 @@ class Toolbox(QObject, Extension):
url = "{base_url}/packages/{package_id}/ratings".format(base_url = self._api_url, package_id = package_id)
data = "{\"data\": {\"cura_version\": \"%s\", \"rating\": %i}}" % (Version(self._application.getVersion()), rating)
self._application.getHttpNetworkRequestManager().put(url, headers_dict = self._request_headers,
data = data.encode())
self._application.getHttpRequestManager().put(url, headers_dict = self._request_headers,
data = data.encode())
@pyqtSlot(result = str)
def getLicenseDialogPluginName(self) -> str:
@ -563,10 +563,10 @@ class Toolbox(QObject, Extension):
callback = lambda r, rt = request_type: self._onAuthorsDataRequestFinished(rt, r)
error_callback = lambda r, e, rt = request_type: self._onAuthorsDataRequestFinished(rt, r, e)
self._application.getHttpNetworkRequestManager().get(url,
headers_dict = self._request_headers,
callback = callback,
error_callback = error_callback)
self._application.getHttpRequestManager().get(url,
headers_dict = self._request_headers,
callback = callback,
error_callback = error_callback)
def _onAuthorsDataRequestFinished(self, request_type: str,
reply: "QNetworkReply",
@ -618,10 +618,10 @@ class Toolbox(QObject, Extension):
callback = lambda r: self._onDownloadFinished(r)
error_callback = lambda r, e: self._onDownloadFailed(r, e)
download_progress_callback = self._onDownloadProgress
request_data = self._application.getHttpNetworkRequestManager().get(url, headers_dict = self._request_headers,
callback = callback,
error_callback = error_callback,
download_progress_callback = download_progress_callback)
request_data = self._application.getHttpRequestManager().get(url, headers_dict = self._request_headers,
callback = callback,
error_callback = error_callback,
download_progress_callback = download_progress_callback)
self._download_request_data = request_data
self.setDownloadProgress(0)
@ -631,7 +631,7 @@ class Toolbox(QObject, Extension):
def cancelDownload(self) -> None:
Logger.log("i", "User cancelled the download of a package. request %s", self._download_request_data)
if self._download_request_data is not None:
self._application.getHttpNetworkRequestManager().abortRequest(self._download_request_data)
self._application.getHttpRequestManager().abortRequest(self._download_request_data)
self._download_request_data = None
self.resetDownload()