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

Change name of the signals so they are consistent with rest of the code

Browse source 
CURA-6005
This commit is contained in:
Jaime van Kessel 2019-01-04 10:51:07 +01:00
parent 23315260ae
commit 3b498d3a34
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,10 +27,10 @@ class DriveApiService:
BACKUP_URL = "{}/backups".format(Settings.DRIVE_API_URL) BACKUP_URL = "{}/backups".format(Settings.DRIVE_API_URL)
# Emit signal when restoring backup started or finished. # Emit signal when restoring backup started or finished.
onRestoringStateChanged = Signal() restoringStateChanged = Signal()
# Emit signal when creating backup started or finished. # Emit signal when creating backup started or finished.
onCreatingStateChanged = Signal() creatingStateChanged = Signal()
def __init__(self) -> None: def __init__(self) -> None:
self._cura_api = CuraApplication.getInstance().getCuraAPI() self._cura_api = CuraApplication.getInstance().getCuraAPI()
@ -52,12 +52,12 @@ class DriveApiService:
return backup_list_request.json()["data"] return backup_list_request.json()["data"]
def createBackup(self) -> None: def createBackup(self) -> None:
self.onCreatingStateChanged.emit(is_creating = True) self.creatingStateChanged.emit(is_creating = True)
# Create the backup. # Create the backup.
backup_zip_file, backup_meta_data = self._cura_api.backups.createBackup() backup_zip_file, backup_meta_data = self._cura_api.backups.createBackup()
if not backup_zip_file or not backup_meta_data: if not backup_zip_file or not backup_meta_data:
self.onCreatingStateChanged.emit(is_creating = False, error_message = "Could not create backup.") self.creatingStateChanged.emit(is_creating = False, error_message ="Could not create backup.")
return return
# Create an upload entry for the backup. # Create an upload entry for the backup.
@ -65,7 +65,7 @@ class DriveApiService:
backup_meta_data["description"] = "{}.backup.{}.cura.zip".format(timestamp, backup_meta_data["cura_release"]) backup_meta_data["description"] = "{}.backup.{}.cura.zip".format(timestamp, backup_meta_data["cura_release"])
backup_upload_url = self._requestBackupUpload(backup_meta_data, len(backup_zip_file)) backup_upload_url = self._requestBackupUpload(backup_meta_data, len(backup_zip_file))
if not backup_upload_url: if not backup_upload_url:
self.onCreatingStateChanged.emit(is_creating = False, error_message = "Could not upload backup.") self.creatingStateChanged.emit(is_creating = False, error_message ="Could not upload backup.")
return return
# Upload the backup to storage. # Upload the backup to storage.
@ -76,12 +76,12 @@ class DriveApiService:
def _onUploadFinished(self, job: "UploadBackupJob") -> None: def _onUploadFinished(self, job: "UploadBackupJob") -> None:
if job.backup_upload_error_message != "": if job.backup_upload_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.onCreatingStateChanged.emit(is_creating = False, error_message = job.backup_upload_error_message) self.creatingStateChanged.emit(is_creating = False, error_message = job.backup_upload_error_message)
else: else:
self.onCreatingStateChanged.emit(is_creating = False) self.creatingStateChanged.emit(is_creating = False)
def restoreBackup(self, backup: Dict[str, Any]) -> None: def restoreBackup(self, backup: Dict[str, Any]) -> None:
self.onRestoringStateChanged.emit(is_restoring = True) self.restoringStateChanged.emit(is_restoring = True)
download_url = backup.get("download_url") download_url = backup.get("download_url")
if not download_url: if not download_url:
# If there is no download URL, we can't restore the backup. # If there is no download URL, we can't restore the backup.
@ -108,11 +108,11 @@ class DriveApiService:
# Tell Cura to place the backup back in the user data folder. # Tell Cura to place the backup back in the user data folder.
with open(temporary_backup_file.name, "rb") as read_backup: with open(temporary_backup_file.name, "rb") as read_backup:
self._cura_api.backups.restoreBackup(read_backup.read(), backup.get("data")) self._cura_api.backups.restoreBackup(read_backup.read(), backup.get("data"))
self.onRestoringStateChanged.emit(is_restoring = False) self.restoringStateChanged.emit(is_restoring = False)
def _emitRestoreError(self): def _emitRestoreError(self):
self.onRestoringStateChanged.emit(is_restoring = False, self.restoringStateChanged.emit(is_restoring = False,
error_message = catalog.i18nc("@info:backup_status", error_message = catalog.i18nc("@info:backup_status",
"There was an error trying to restore your backup.")) "There was an error trying to restore your backup."))
# Verify the MD5 hash of a file. # Verify the MD5 hash of a file.

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

@ -51,8 +51,8 @@ class DrivePluginExtension(QObject, Extension):
# Attach signals. # Attach signals.
CuraApplication.getInstance().getCuraAPI().account.loginStateChanged.connect(self._onLoginStateChanged) CuraApplication.getInstance().getCuraAPI().account.loginStateChanged.connect(self._onLoginStateChanged)
self._drive_api_service.onRestoringStateChanged.connect(self._onRestoringStateChanged) self._drive_api_service.restoringStateChanged.connect(self._onRestoringStateChanged)
self._drive_api_service.onCreatingStateChanged.connect(self._onCreatingStateChanged) self._drive_api_service.creatingStateChanged.connect(self._onCreatingStateChanged)
# Register preferences. # Register preferences.
self._preferences.addPreference(Settings.AUTO_BACKUP_ENABLED_PREFERENCE_KEY, False) self._preferences.addPreference(Settings.AUTO_BACKUP_ENABLED_PREFERENCE_KEY, False)