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

Always show manual printer instances, even before they are validated

Browse source 
CURA-2483
This commit is contained in:
fieldOfView 2016-09-28 23:08:23 +02:00
parent 8dd8fd740c
commit eba49ee8c2
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
NetworkPrinterOutputDevicePlugin.py
View file

@ -62,10 +62,20 @@ class NetworkPrinterOutputDevicePlugin(OutputDevicePlugin):
# Look for manual instances from preference # Look for manual instances from preference
for address in self._manual_instances: for address in self._manual_instances:
url = QUrl("http://" + address + self._api_prefix + "system/name") self.addManualPrinter(address)
name_request = QNetworkRequest(url) def addManualPrinter(self, address):
self._network_manager.get(name_request) # Add a preliminary printer instance
name = address
instance_name = "manual:%s" % address
properties = { b"name": name.encode("UTF-8") }
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")
name_request = QNetworkRequest(url)
self._network_manager.get(name_request)
## Handler for all requests that have finished. ## Handler for all requests that have finished.
def _onNetworkRequestFinished(self, reply): def _onNetworkRequestFinished(self, reply):
@ -76,10 +86,12 @@ class NetworkPrinterOutputDevicePlugin(OutputDevicePlugin):
if "system/name" in reply_url: # Name returned from printer. if "system/name" in reply_url: # Name returned from printer.
if status_code == 200: if status_code == 200:
address = reply.url().host() address = reply.url().host()
name = reply.readAll() name = reply.readAll().data().decode()
name = ("%s (%s)" % (name, address))
instance_name = "manual:%s" % address instance_name = "manual:%s" % address
properties = { b"name": name.data() } properties = { b"name": name.encode("UTF-8") }
self.removePrinter(instance_name)
self.addPrinter(instance_name, address, properties) self.addPrinter(instance_name, address, properties)
## Stop looking for devices on network. ## Stop looking for devices on network.