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

Revert "Add a sync timeout to CloudOutputDeviceManager"

Browse source 
Stopgap solution is not necessary anymore after CloudOutputDeviceManager
after implementing timeouts on the http-level.

This reverts commit 15f813a4
This commit is contained in:
Nino van Hooff 2020-05-15 11:32:49 +02:00
parent f3c66c3189
commit 9acf8b6122
1 changed files with 8 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,9 +27,6 @@ class CloudOutputDeviceManager:
API spec is available on https://api.ultimaker.com/docs/connect/spec/. API spec is available on https://api.ultimaker.com/docs/connect/spec/.
""" """
SYNC_TIMEOUT = 50.0
"""seconds. Adding many different kinds of printers can take a long time"""
META_CLUSTER_ID = "um_cloud_cluster_id" META_CLUSTER_ID = "um_cloud_cluster_id"
META_NETWORK_KEY = "um_network_key" META_NETWORK_KEY = "um_network_key"
SYNC_SERVICE_NAME = "CloudOutputDeviceManager" SYNC_SERVICE_NAME = "CloudOutputDeviceManager"
@ -50,13 +47,7 @@ class CloudOutputDeviceManager:
# Ensure we don't start twice. # Ensure we don't start twice.
self._running = False self._running = False
# Unfortunately, not all cases of a failed request result in an error callback, such as VPN connection self._syncing = False
# being broken or possibly switching wifi networks. Better solution: Refactor CloudApiClient to use
# HttpRequestManager, which supports timeout.
self._sync_timeout_timer = QTimer()
self._sync_timeout_timer.setInterval(int(self.SYNC_TIMEOUT * 1000))
self._sync_timeout_timer.setSingleShot(True)
self._sync_timeout_timer.timeout.connect(self._onSyncTimeout)
def start(self): def start(self):
"""Starts running the cloud output device manager, thus periodically requesting cloud data.""" """Starts running the cloud output device manager, thus periodically requesting cloud data."""
@ -94,13 +85,12 @@ class CloudOutputDeviceManager:
def _getRemoteClusters(self) -> None: def _getRemoteClusters(self) -> None:
"""Gets all remote clusters from the API.""" """Gets all remote clusters from the API."""
if self._sync_timeout_timer.isActive(): if self._syncing:
# A sync is running
return return
Logger.info("Syncing cloud printer clusters") Logger.info("Syncing cloud printer clusters")
self._sync_timeout_timer.start() self._syncing = True
self._account.setSyncState(self.SYNC_SERVICE_NAME, SyncState.SYNCING) self._account.setSyncState(self.SYNC_SERVICE_NAME, SyncState.SYNCING)
self._api.getClusters(self._onGetRemoteClustersFinished, self._onGetRemoteClusterFailed) self._api.getClusters(self._onGetRemoteClustersFinished, self._onGetRemoteClusterFailed)
@ -126,10 +116,12 @@ class CloudOutputDeviceManager:
# If the removed device was active we should connect to the new active device # If the removed device was active we should connect to the new active device
self._connectToActiveMachine() self._connectToActiveMachine()
self._onSyncFinished(True) self._syncing = False
self._account.setSyncState(self.SYNC_SERVICE_NAME, SyncState.SUCCESS)
def _onGetRemoteClusterFailed(self, reply: QNetworkReply, error: QNetworkReply.NetworkError): def _onGetRemoteClusterFailed(self, reply: QNetworkReply, error: QNetworkReply.NetworkError):
self._onSyncFinished(False) self._syncing = False
self._account.setSyncState(self.SYNC_SERVICE_NAME, SyncState.ERROR)
def _onDevicesDiscovered(self, clusters: List[CloudClusterResponse]) -> None: def _onDevicesDiscovered(self, clusters: List[CloudClusterResponse]) -> None:
"""**Synchronously** create machines for discovered devices """**Synchronously** create machines for discovered devices
@ -232,19 +224,6 @@ class CloudOutputDeviceManager:
if device.key in output_device_manager.getOutputDeviceIds(): if device.key in output_device_manager.getOutputDeviceIds():
output_device_manager.removeOutputDevice(device.key) output_device_manager.removeOutputDevice(device.key)
def _onSyncTimeout(self):
Logger.warning("Cloud printer sync timed out after {} seconds".format(self.SYNC_TIMEOUT))
self._onSyncFinished(False)
def _onSyncFinished(self, success: bool):
if self._sync_timeout_timer.isActive():
self._sync_timeout_timer.stop()
if success:
self._account.setSyncState(self.SYNC_SERVICE_NAME, SyncState.SUCCESS)
else:
self._account.setSyncState(self.SYNC_SERVICE_NAME, SyncState.ERROR)
def _createMachineFromDiscoveredDevice(self, key: str, activate: bool = True) -> None: def _createMachineFromDiscoveredDevice(self, key: str, activate: bool = True) -> None:
device = self._remote_clusters[key] device = self._remote_clusters[key]
if not device: if not device:
@ -299,4 +278,4 @@ class CloudOutputDeviceManager:
output_device_manager = CuraApplication.getInstance().getOutputDeviceManager() output_device_manager = CuraApplication.getInstance().getOutputDeviceManager()
if device.key not in output_device_manager.getOutputDeviceIds(): if device.key not in output_device_manager.getOutputDeviceIds():
output_device_manager.addOutputDevice(device) output_device_manager.addOutputDevice(device)