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

Add input checking for incorrect responses from printers

Browse source 
We should not crash when getting invalid data. Just put a warning in the log there and ignore the message for the rest.
This commit is contained in:
Ghostkeeper 2017-08-21 00:57:25 +02:00
parent b7493ae1a8
commit df88772071
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevicePlugin.py
View file

@ -117,7 +117,14 @@ class NetworkPrinterOutputDevicePlugin(OutputDevicePlugin):
if reply.operation() == QNetworkAccessManager.GetOperation: if reply.operation() == QNetworkAccessManager.GetOperation:
if "system" in reply_url: # Name returned from printer. if "system" in reply_url: # Name returned from printer.
if status_code == 200: if status_code == 200:
system_info = json.loads(bytes(reply.readAll()).decode("utf-8")) try:
system_info = json.loads(bytes(reply.readAll()).decode("utf-8"))
except json.JSONDecodeError:
Logger.log("e", "Printer returned invalid JSON.")
return
except UnicodeDecodeError:
Logger.log("e", "Printer returned incorrect UTF-8.")
return
address = reply.url().host() address = reply.url().host()
instance_name = "manual:%s" % address instance_name = "manual:%s" % address