3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 07:27:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/CURA-7150_proper_http_request_headers' into CURA-7150_proper_http_request_headers

Browse source
This commit is contained in:
Nino van Hooff 2020-03-20 17:34:12 +01:00
commit 96d1e6385d
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/CuraDrive/src/DriveApiService.py
View file

@ -86,20 +86,20 @@ class DriveApiService:
restore_backup_job.finished.connect(self._onRestoreFinished) restore_backup_job.finished.connect(self._onRestoreFinished)
restore_backup_job.start() restore_backup_job.start()
def _onRestoreFinished(self, job: "RestoreBackupJob"): def _onRestoreFinished(self, job: "RestoreBackupJob") -> None:
if job.restore_backup_error_message != "": if job.restore_backup_error_message != "":
# If the job contains an error message we pass it along so the UI can display it. # If the job contains an error message we pass it along so the UI can display it.
self.restoringStateChanged.emit(is_restoring=False) self.restoringStateChanged.emit(is_restoring=False)
else: else:
self.restoringStateChanged.emit(is_restoring = False, error_message = job.restore_backup_error_message) self.restoringStateChanged.emit(is_restoring = False, error_message = job.restore_backup_error_message)
def deleteBackup(self, backup_id: str, finishedCallable: Callable[[bool], None]): def deleteBackup(self, backup_id: str, finished_callable: Callable[[bool], None]):
def finishedCallback(reply: QNetworkReply, ca=finishedCallable) -> None: def finishedCallback(reply: QNetworkReply, ca: Callable[[bool], None] = finished_callable) -> None:
self._onDeleteRequestCompleted(reply, None, ca) self._onDeleteRequestCompleted(reply, ca)
def errorCallback(reply: QNetworkReply, error: QNetworkReply.NetworkError, ca=finishedCallable) -> None: def errorCallback(reply: QNetworkReply, error: QNetworkReply.NetworkError, ca: Callable[[bool], None] = finished_callable) -> None:
self._onDeleteRequestCompleted(reply, error, ca) self._onDeleteRequestCompleted(reply, ca, error)
HttpRequestManager.getInstance().delete( HttpRequestManager.getInstance().delete(
url = "{}/{}".format(self.BACKUP_URL, backup_id), url = "{}/{}".format(self.BACKUP_URL, backup_id),
@ -109,5 +109,5 @@ class DriveApiService:
) )
@staticmethod @staticmethod
def _onDeleteRequestCompleted(reply: QNetworkReply, error: Optional["QNetworkReply.NetworkError"] = None, callable = None): def _onDeleteRequestCompleted(reply: QNetworkReply, callable: Callable[[bool], None], error: Optional["QNetworkReply.NetworkError"] = None) -> None:
callable(HttpRequestManager.replyIndicatesSuccess(reply, error)) callable(HttpRequestManager.replyIndicatesSuccess(reply, error))

2
plugins/CuraDrive/src/DrivePluginExtension.py
View file

@ -135,7 +135,7 @@ class DrivePluginExtension(QObject, Extension):
def refreshBackups(self) -> None: def refreshBackups(self) -> None:
self._drive_api_service.getBackups(self._backupsChangedCallback) self._drive_api_service.getBackups(self._backupsChangedCallback)
def _backupsChangedCallback(self, backups): def _backupsChangedCallback(self, backups: List[Dict[str, Any]]) -> None:
self._backups = backups self._backups = backups
self.backupsChanged.emit() self.backupsChanged.emit()