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

Create Account sync state interface to allow for multiple sync services

Browse source 
Needed to add the package sync

CURA-7290
This commit is contained in:
Nino van Hooff 2020-05-04 13:52:40 +02:00
parent 81d02d5d58
commit 049c1946d4
2 changed files with 38 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

44
cura/API/Account.py
View file

@ -32,11 +32,12 @@ class Account(QObject):
loginStateChanged = pyqtSignal(bool)
accessTokenChanged = pyqtSignal()
cloudPrintersDetectedChanged = pyqtSignal(bool)
isSyncingChanged = pyqtSignal(str)
manualSyncRequested = pyqtSignal()
lastSyncDateTimeChanged = pyqtSignal()
syncStateChanged = pyqtSignal()
SYNC_STATES = ["syncing", "success", "error"]
def __init__(self, application: "CuraApplication", parent = None) -> None:
super().__init__(parent)
self._application = application
@ -65,13 +66,44 @@ class Account(QObject):
self._authorization_service = AuthorizationService(self._oauth_settings)
self._sync_clients = {}
"""contains entries "client_name" : "state["success"|"error|"syncing"]"""
def initialize(self) -> None:
self._authorization_service.initialize(self._application.getPreferences())
self._authorization_service.onAuthStateChanged.connect(self._onLoginStateChanged)
self._authorization_service.onAuthenticationError.connect(self._onLoginStateChanged)
self._authorization_service.accessTokenChanged.connect(self._onAccessTokenChanged)
self._authorization_service.loadAuthDataFromPreferences()
self.isSyncingChanged.connect(self._onIsSyncingChanged)
def setSyncState(self, service_name: str, state: str) -> None:
""" Can be used to register and update account sync states
Example: `setSyncState("packages", "syncing")`
:param service_name: A unique name for your service, such as `plugins` or `backups`
:param state: One of Account.SYNC_STATES
"""
prev_state = self._sync_state
if state not in Account.SYNC_STATES:
raise AttributeError("Invalid state parameter: {}".format(state))
self._sync_clients[service_name] = state
if any(val == "syncing" for val in self._sync_clients.values()):
self._sync_state = "syncing"
elif any(val == "error" for val in self._sync_clients.values()):
self._sync_state = "error"
else:
self._sync_state = "success"
if self._sync_state != prev_state:
self.syncStateChanged.emit()
if self._sync_state == "success":
self._last_sync_str = datetime.now().strftime("%d/%m/%Y %H:%M")
self.lastSyncDateTimeChanged.emit()
def _onAccessTokenChanged(self):
self.accessTokenChanged.emit()
@ -137,14 +169,6 @@ class Account(QObject):
return None
return user_profile.__dict__
def _onIsSyncingChanged(self, newState: str):
if newState == "success":
self._last_sync_str = datetime.now().strftime("%d/%m/%Y %H:%M")
self.lastSyncDateTimeChanged.emit()
self._sync_state = newState
self.syncStateChanged.emit()
@pyqtProperty(str, notify=lastSyncDateTimeChanged)
def lastSyncDateTime(self) -> str:
return self._last_sync_str

7
plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
View file

@ -27,6 +27,7 @@ class CloudOutputDeviceManager:
META_CLUSTER_ID = "um_cloud_cluster_id"
META_NETWORK_KEY = "um_network_key"
SYNC_SERVICE_NAME = "CloudOutputDeviceManager"
# The interval with which the remote clusters are checked
CHECK_CLUSTER_INTERVAL = 30.0 # seconds
@ -103,7 +104,7 @@ class CloudOutputDeviceManager:
self._update_timer.stop()
self._syncing = True
self._account.isSyncingChanged.emit("syncing")
self._account.setSyncState(self.SYNC_SERVICE_NAME, "syncing")
self._api.getClusters(self._onGetRemoteClustersFinished, self._onGetRemoteClusterFailed)
def _onGetRemoteClustersFinished(self, clusters: List[CloudClusterResponse]) -> None:
@ -133,13 +134,13 @@ class CloudOutputDeviceManager:
self._connectToActiveMachine()
self._syncing = False
self._account.isSyncingChanged.emit("success")
self._account.setSyncState(self.SYNC_SERVICE_NAME, "success")
# Schedule a new update
self._update_timer.start()
def _onGetRemoteClusterFailed(self):
self._syncing = False
self._account.isSyncingChanged.emit("error")
self._account.setSyncState(self.SYNC_SERVICE_NAME, "error")
# Schedule a new update
self._update_timer.start()