GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-18 04:25:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moved exception handling closer to the cause of error

Browse Source
This commit is contained in:
Marijn Deé 2018-11-22 10:01:15 +01:00
parent 7e3f86f091
commit 352427e460
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/UM3NetworkPrinting/src/SendMaterialJob.py
View File

@ -46,9 +46,8 @@ class SendMaterialJob(Job):
# Collect materials from the printer's reply and send the missing ones if needed. # Collect materials from the printer's reply and send the missing ones if needed.
try: try:
remote_materials_by_guid = self._parseReply(reply) remote_materials_by_guid = self._parseReply(reply)
self._sendMissingMaterials(remote_materials_by_guid) if remote_materials_by_guid:
except json.JSONDecodeError: self._sendMissingMaterials(remote_materials_by_guid)
Logger.logException("w", "Error parsing materials from printer")
except TypeError: except TypeError:
Logger.logException("w", "Error parsing materials from printer") Logger.logException("w", "Error parsing materials from printer")
@ -153,12 +152,14 @@ class SendMaterialJob(Job):
# Parses the reply to a "/materials" request to the printer # Parses the reply to a "/materials" request to the printer
# #
# \return a dictionary of ClusterMaterial objects by GUID # \return a dictionary of ClusterMaterial objects by GUID
# \throw json.JSONDecodeError Raised when the reply does not contain a valid json string
# \throw KeyError Raised when on of the materials does not include a valid guid # \throw KeyError Raised when on of the materials does not include a valid guid
@classmethod @classmethod
def _parseReply(cls, reply: QNetworkReply) -> Dict[str, ClusterMaterial]: def _parseReply(cls, reply: QNetworkReply) -> Dict[str, ClusterMaterial]:
remote_materials = json.loads(reply.readAll().data().decode("utf-8")) try:
return {material["guid"]: ClusterMaterial(**material) for material in remote_materials} remote_materials = json.loads(reply.readAll().data().decode("utf-8"))
return {material["guid"]: ClusterMaterial(**material) for material in remote_materials}
except json.JSONDecodeError:
Logger.logException("w", "Error parsing materials from printer")
## Retrieves a list of local materials ## Retrieves a list of local materials
# #