mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-14 22:25:57 +08:00
Merge branch '2.7'
This commit is contained in:
commit
db640c6f3d
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user