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

Handle requests ConnectionErrors in Backup plugin

Browse source 
CURA-6471
This commit is contained in:
Lipu Fei 2019-04-23 09:07:16 +02:00
parent 50ad4e4d4e
commit 97def2f6b1
1 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,7 @@ class DriveApiService:
"Authorization": "Bearer {}".format(access_token) "Authorization": "Bearer {}".format(access_token)
}) })
except requests.exceptions.ConnectionError: except requests.exceptions.ConnectionError:
Logger.log("w", "Unable to connect with the server.") Logger.logException("w", "Unable to connect with the server.")
return [] return []
# HTTP status 300s mean redirection. 400s and 500s are errors. # HTTP status 300s mean redirection. 400s and 500s are errors.
@ -98,7 +98,12 @@ class DriveApiService:
# If there is no download URL, we can't restore the backup. # If there is no download URL, we can't restore the backup.
return self._emitRestoreError() return self._emitRestoreError()
download_package = requests.get(download_url, stream = True) try:
download_package = requests.get(download_url, stream = True)
except requests.exceptions.ConnectionError:
Logger.logException("e", "Unable to connect with the server")
return self._emitRestoreError()
if download_package.status_code >= 300: if download_package.status_code >= 300:
# Something went wrong when attempting to download the backup. # Something went wrong when attempting to download the backup.
Logger.log("w", "Could not download backup from url %s: %s", download_url, download_package.text) Logger.log("w", "Could not download backup from url %s: %s", download_url, download_package.text)
@ -142,9 +147,14 @@ class DriveApiService:
Logger.log("w", "Could not get access token.") Logger.log("w", "Could not get access token.")
return False return False
delete_backup = requests.delete("{}/{}".format(self.BACKUP_URL, backup_id), headers = { try:
"Authorization": "Bearer {}".format(access_token) delete_backup = requests.delete("{}/{}".format(self.BACKUP_URL, backup_id), headers = {
}) "Authorization": "Bearer {}".format(access_token)
})
except requests.exceptions.ConnectionError:
Logger.logException("e", "Unable to connect with the server")
return False
if delete_backup.status_code >= 300: if delete_backup.status_code >= 300:
Logger.log("w", "Could not delete backup: %s", delete_backup.text) Logger.log("w", "Could not delete backup: %s", delete_backup.text)
return False return False
@ -159,15 +169,19 @@ class DriveApiService:
if not access_token: if not access_token:
Logger.log("w", "Could not get access token.") Logger.log("w", "Could not get access token.")
return None return None
try:
backup_upload_request = requests.put(self.BACKUP_URL, json = { backup_upload_request = requests.put(
"data": { self.BACKUP_URL,
"backup_size": backup_size, json = {"data": {"backup_size": backup_size,
"metadata": backup_metadata "metadata": backup_metadata
} }
}, headers = { },
"Authorization": "Bearer {}".format(access_token) headers = {
}) "Authorization": "Bearer {}".format(access_token)
})
except requests.exceptions.ConnectionError:
Logger.logException("e", "Unable to connect with the server")
return None
# Any status code of 300 or above indicates an error. # Any status code of 300 or above indicates an error.
if backup_upload_request.status_code >= 300: if backup_upload_request.status_code >= 300: