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

Only allow connecting if the printer has responded to API query

Browse source 
CURA-2483
This commit is contained in:
fieldOfView 2016-09-29 14:29:33 +02:00
parent a2722c7571
commit ea9ba87fa4
2 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
NetworkPrinterOutputDevicePlugin.py
View file

@ -63,7 +63,8 @@ class NetworkPrinterOutputDevicePlugin(OutputDevicePlugin):
# Look for manual instances from preference
for address in self._manual_instances:
self.addManualPrinter(address)
if address:
self.addManualPrinter(address)
def addManualPrinter(self, address):
if address not in self._manual_instances:
@ -72,17 +73,13 @@ class NetworkPrinterOutputDevicePlugin(OutputDevicePlugin):
name = address
instance_name = "manual:%s" % address
properties = { b"name": name.encode("UTF-8") }
properties = { b"name": name.encode("UTF-8"), b"incomplete": True }
if instance_name not in self._printers:
# Add a preliminary printer instance
self.addPrinter(instance_name, address, properties)
# Check if a printer exists at this address
# If a printer responds, it will replace the preliminary printer created above
url = QUrl("http://" + address + self._api_prefix + "system")
name_request = QNetworkRequest(url)
self._network_manager.get(name_request)
self.checkManualPrinter(address)
def removeManualPrinter(self, key, address = None):
if key in self._printers:
@ -94,6 +91,13 @@ class NetworkPrinterOutputDevicePlugin(OutputDevicePlugin):
self._manual_instances.remove(address)
self._preferences.setValue("um3networkprinting/manual_instances", ",".join(self._manual_instances))
def checkManualPrinter(self, address):
# Check if a printer exists at this address
# If a printer responds, it will replace the preliminary printer created above
url = QUrl("http://" + address + self._api_prefix + "system")
name_request = QNetworkRequest(url)
self._network_manager.get(name_request)
## Handler for all requests that have finished.
def _onNetworkRequestFinished(self, reply):
reply_url = reply.url().toString()