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

Use cluster_id as dict key, remove unneeded white space

Browse source
This commit is contained in:
ChrisTerBeke 2018-11-27 17:03:19 +01:00
parent 4e150fb4bf
commit 26f107d176
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,6 @@ class CloudOutputDeviceManager(NetworkClient):
self._update_clusters_thread = Thread(target=self._updateClusters, daemon=True) self._update_clusters_thread = Thread(target=self._updateClusters, daemon=True)
self._update_clusters_thread.start() self._update_clusters_thread.start()
## Override _createEmptyRequest to add the needed authentication header for talking to the Ultimaker Cloud API. ## Override _createEmptyRequest to add the needed authentication header for talking to the Ultimaker Cloud API.
def _createEmptyRequest(self, path: str, content_type: Optional[str] = "application/json") -> QNetworkRequest: def _createEmptyRequest(self, path: str, content_type: Optional[str] = "application/json") -> QNetworkRequest:
request = super()._createEmptyRequest(self.API_ROOT_PATH + path, content_type = content_type) request = super()._createEmptyRequest(self.API_ROOT_PATH + path, content_type = content_type)
@ -81,14 +80,14 @@ class CloudOutputDeviceManager(NetworkClient):
return return
known_cluster_ids = set(self._remote_clusters.keys()) known_cluster_ids = set(self._remote_clusters.keys())
found_clusters_ids = set(found_clusters.keys()) found_cluster_ids = set(found_clusters.keys())
# Add an output device for each new remote cluster. # Add an output device for each new remote cluster.
for cluster_id in found_clusters_ids.difference(known_cluster_ids): for cluster_id in found_cluster_ids.difference(known_cluster_ids):
self._addCloudOutputDevice(found_clusters[cluster_id]) self._addCloudOutputDevice(found_clusters[cluster_id])
# Remove output devices that are gone # Remove output devices that are gone
for cluster_id in known_cluster_ids.difference(found_clusters_ids): for cluster_id in known_cluster_ids.difference(found_cluster_ids):
self._removeCloudOutputDevice(found_clusters[cluster_id]) self._removeCloudOutputDevice(found_clusters[cluster_id])
# For testing we add a dummy device: # For testing we add a dummy device:
@ -97,7 +96,7 @@ class CloudOutputDeviceManager(NetworkClient):
@staticmethod @staticmethod
def _parseStatusResponse(reply: QNetworkReply) -> Dict[str, CloudCluster]: def _parseStatusResponse(reply: QNetworkReply) -> Dict[str, CloudCluster]:
try: try:
return {c["guid"]: CloudCluster(**c) for c in json.loads(reply.readAll().data().decode("utf-8"))} return {c["cluster_id"]: CloudCluster(**c) for c in json.loads(reply.readAll().data().decode("utf-8"))}
except UnicodeDecodeError: except UnicodeDecodeError:
Logger.log("w", "Unable to read server response") Logger.log("w", "Unable to read server response")
except json.decoder.JSONDecodeError: except json.decoder.JSONDecodeError: