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

Re-implement ConnectionStatus by adding a pyqtSignal to HttpRequestMgr

Browse source 
and using ConnectionStatus as proxy for it.

CURA-7492
This commit is contained in:
Nino van Hooff 2020-06-15 11:39:06 +02:00
parent 9bf9bf9a3f
commit 994f9fbde7
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
cura/API/ConnectionStatus.py
View file

@ -2,11 +2,16 @@ from typing import Optional
from PyQt5.QtCore import QObject, pyqtSignal, pyqtProperty from PyQt5.QtCore import QObject, pyqtSignal, pyqtProperty
from UM.Logger import Logger from UM.TaskManagement.HttpRequestManager import HttpRequestManager
class ConnectionStatus(QObject): class ConnectionStatus(QObject):
"""Status info for some web services""" """Provides an estimation of whether internet is reachable
Estimation is updated with every request through HttpRequestManager.
Acts as a proxy to HttpRequestManager.internetReachableChanged without
exposing the HttpRequestManager in its entirety.
"""
__instance = None # type: Optional[ConnectionStatus] __instance = None # type: Optional[ConnectionStatus]
@ -21,16 +26,16 @@ class ConnectionStatus(QObject):
def __init__(self, parent: Optional["QObject"] = None) -> None: def __init__(self, parent: Optional["QObject"] = None) -> None:
super().__init__(parent) super().__init__(parent)
self._is_internet_reachable = True # type: bool manager = HttpRequestManager.getInstance()
self._is_internet_reachable = manager.isInternetReachable # type: bool
manager.internetReachableChanged.connect(self._onInternetReachableChanged)
@pyqtProperty(bool, notify = internetReachableChanged) @pyqtProperty(bool, notify = internetReachableChanged)
def isInternetReachable(self) -> bool: def isInternetReachable(self) -> bool:
return self._is_internet_reachable return self._is_internet_reachable
def setOnlineStatus(self, new_status: bool) -> None: def _onInternetReachableChanged(self, reachable: bool):
old_status = self._is_internet_reachable if reachable != self._is_internet_reachable:
self._is_internet_reachable = new_status self._is_internet_reachable = reachable
if old_status != new_status:
Logger.debug(
"Connection status has been set to {}".format("online" if self._is_internet_reachable else "offline"))
self.internetReachableChanged.emit() self.internetReachableChanged.emit()

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

@ -106,8 +106,6 @@ class CloudOutputDeviceManager:
def _onGetRemoteClustersFinished(self, clusters: List[CloudClusterResponse]) -> None: def _onGetRemoteClustersFinished(self, clusters: List[CloudClusterResponse]) -> None:
"""Callback for when the request for getting the clusters is successful and finished.""" """Callback for when the request for getting the clusters is successful and finished."""
# Remote clusters were successfully retrieved, which means that the computer is online
CuraApplication.getInstance().getCuraAPI().connectionStatus.setOnlineStatus(True)
self._um_cloud_printers = {m.getMetaDataEntry(self.META_CLUSTER_ID): m for m in self._um_cloud_printers = {m.getMetaDataEntry(self.META_CLUSTER_ID): m for m in
CuraApplication.getInstance().getContainerRegistry().findContainerStacks( CuraApplication.getInstance().getContainerRegistry().findContainerStacks(
type = "machine") if m.getMetaDataEntry(self.META_CLUSTER_ID, None)} type = "machine") if m.getMetaDataEntry(self.META_CLUSTER_ID, None)}
@ -152,9 +150,6 @@ class CloudOutputDeviceManager:
def _onGetRemoteClusterFailed(self, reply: QNetworkReply, error: QNetworkReply.NetworkError) -> None: def _onGetRemoteClusterFailed(self, reply: QNetworkReply, error: QNetworkReply.NetworkError) -> None:
self._syncing = False self._syncing = False
self._account.setSyncState(self.SYNC_SERVICE_NAME, SyncState.ERROR) self._account.setSyncState(self.SYNC_SERVICE_NAME, SyncState.ERROR)
# If getting the remote clusters fails, then the cloud printers are unreachable, so we need to inform the
# connection status
CuraApplication.getInstance().getCuraAPI().connectionStatus.setOnlineStatus(False)
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