3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 05:37:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge remote-tracking branch 'UM3NetworkPrintingPlugin/master' into UM3NPP_merge

Browse source
This commit is contained in:
Thomas Karl Pietrowski 2016-11-21 14:44:10 +01:00
commit 65add78401
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/UM3NetworkPrintingPlugin/NetworkPrinterOutputDevice.py
View file

@ -200,6 +200,8 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
Logger.log("d", "Authentication was required. Setting up authenticator.") Logger.log("d", "Authentication was required. Setting up authenticator.")
authenticator.setUser(self._authentication_id) authenticator.setUser(self._authentication_id)
authenticator.setPassword(self._authentication_key) authenticator.setPassword(self._authentication_key)
else:
Logger.log("d", "No authentication was required. The id is: %s", self._authentication_id)
def getProperties(self): def getProperties(self):
return self._properties return self._properties

5
plugins/UM3NetworkPrintingPlugin/NetworkPrinterOutputDevicePlugin.py
View file

@ -191,9 +191,12 @@ class NetworkPrinterOutputDevicePlugin(OutputDevicePlugin):
info = zeroconf.get_service_info(service_type, name) info = zeroconf.get_service_info(service_type, name)
if info: if info:
if info.properties.get(b"type", None) == b'printer': type_of_device = info.properties.get(b"type", None).decode("utf-8")
if type_of_device == "printer":
address = '.'.join(map(lambda n: str(n), info.address)) address = '.'.join(map(lambda n: str(n), info.address))
self.addPrinterSignal.emit(str(name), address, info.properties) self.addPrinterSignal.emit(str(name), address, info.properties)
else:
Logger.log("w", "The type of the found device is '%s', not 'printer'! Ignoring.." %type_of_device )
else: else:
Logger.log("w", "Could not get information about %s" % name) Logger.log("w", "Could not get information about %s" % name)