GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 16:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not use the JsonDecorator scope for binary downloads

Browse Source 
CURA-7150
This commit is contained in:
Nino van Hooff 2020-03-20 17:31:21 +01:00
parent 96ed85f9c0
commit 72a66f1358
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/CuraDrive/src/DriveApiService.py
View File

@ -33,7 +33,7 @@ class DriveApiService:
def __init__(self) -> None: def __init__(self) -> None:
self._cura_api = CuraApplication.getInstance().getCuraAPI() self._cura_api = CuraApplication.getInstance().getCuraAPI()
self._jsonCloudScope = JsonDecoratorScope(UltimakerCloudScope(CuraApplication.getInstance())) self._json_cloud_scope = JsonDecoratorScope(UltimakerCloudScope(CuraApplication.getInstance()))
def getBackups(self, changed: Callable[[List[Dict[str, Any]]], None]) -> None: def getBackups(self, changed: Callable[[List[Dict[str, Any]]], None]) -> None:
def callback(reply: QNetworkReply, error: Optional["QNetworkReply.NetworkError"] = None) -> None: def callback(reply: QNetworkReply, error: Optional["QNetworkReply.NetworkError"] = None) -> None:
@ -55,7 +55,7 @@ class DriveApiService:
self.BACKUP_URL, self.BACKUP_URL,
callback= callback, callback= callback,
error_callback = callback, error_callback = callback,
scope=self._jsonCloudScope scope=self._json_cloud_scope
) )
def createBackup(self) -> None: def createBackup(self) -> None:
@ -105,7 +105,7 @@ class DriveApiService:
url = "{}/{}".format(self.BACKUP_URL, backup_id), url = "{}/{}".format(self.BACKUP_URL, backup_id),
callback = finishedCallback, callback = finishedCallback,
error_callback = errorCallback, error_callback = errorCallback,
scope= self._jsonCloudScope scope= self._json_cloud_scope
) )
@staticmethod @staticmethod

3
plugins/Toolbox/src/CloudSync/DownloadPresenter.py
View File

@ -11,7 +11,6 @@ from UM.Logger import Logger
from UM.Message import Message from UM.Message import Message
from UM.Signal import Signal from UM.Signal import Signal
from UM.TaskManagement.HttpRequestManager import HttpRequestManager from UM.TaskManagement.HttpRequestManager import HttpRequestManager
from UM.TaskManagement.HttpRequestScope import JsonDecoratorScope
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope
from .SubscribedPackagesModel import SubscribedPackagesModel from .SubscribedPackagesModel import SubscribedPackagesModel
@ -30,7 +29,7 @@ class DownloadPresenter:
self.done = Signal() self.done = Signal()
self._app = app self._app = app
self._scope = JsonDecoratorScope(UltimakerCloudScope(app)) self._scope = UltimakerCloudScope(app)
self._started = False self._started = False
self._progress_message = self._createProgressMessage() self._progress_message = self._createProgressMessage()

9
plugins/Toolbox/src/Toolbox.py
View File

@ -52,7 +52,8 @@ class Toolbox(QObject, Extension):
self._download_request_data = None # type: Optional[HttpRequestData] self._download_request_data = None # type: Optional[HttpRequestData]
self._download_progress = 0 # type: float self._download_progress = 0 # type: float
self._is_downloading = False # type: bool self._is_downloading = False # type: bool
self._scope = JsonDecoratorScope(UltimakerCloudScope(application)) # type: JsonDecoratorScope self._cloud_scope = UltimakerCloudScope(application) # type: UltimakerCloudScope
self._json_scope = JsonDecoratorScope(self._cloud_scope) # type: JsonDecoratorScope
self._request_urls = {} # type: Dict[str, str] self._request_urls = {} # type: Dict[str, str]
self._to_update = [] # type: List[str] # Package_ids that are waiting to be updated self._to_update = [] # type: List[str] # Package_ids that are waiting to be updated
@ -149,7 +150,7 @@ class Toolbox(QObject, Extension):
url = "{base_url}/packages/{package_id}/ratings".format(base_url = CloudApiModel.api_url, package_id = package_id) url = "{base_url}/packages/{package_id}/ratings".format(base_url = CloudApiModel.api_url, package_id = package_id)
data = "{\"data\": {\"cura_version\": \"%s\", \"rating\": %i}}" % (Version(self._application.getVersion()), rating) data = "{\"data\": {\"cura_version\": \"%s\", \"rating\": %i}}" % (Version(self._application.getVersion()), rating)
self._application.getHttpRequestManager().put(url, data = data.encode(), scope = self._scope) self._application.getHttpRequestManager().put(url, data = data.encode(), scope = self._json_scope)
def getLicenseDialogPluginFileLocation(self) -> str: def getLicenseDialogPluginFileLocation(self) -> str:
return self._license_dialog_plugin_file_location return self._license_dialog_plugin_file_location
@ -539,7 +540,7 @@ class Toolbox(QObject, Extension):
self._application.getHttpRequestManager().get(url, self._application.getHttpRequestManager().get(url,
callback = callback, callback = callback,
error_callback = error_callback, error_callback = error_callback,
scope=self._scope) scope=self._json_scope)
@pyqtSlot(str) @pyqtSlot(str)
def startDownload(self, url: str) -> None: def startDownload(self, url: str) -> None:
@ -552,7 +553,7 @@ class Toolbox(QObject, Extension):
callback = callback, callback = callback,
error_callback = error_callback, error_callback = error_callback,
download_progress_callback = download_progress_callback, download_progress_callback = download_progress_callback,
scope=self._scope scope=self._cloud_scope
) )
self._download_request_data = request_data self._download_request_data = request_data