3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Callbacks are now handled by url and operation type.

Browse source 
It would have been nicer to use the request, but it's unhashable.

Cl-541
This commit is contained in:
Jaime van Kessel 2017-11-20 15:12:29 +01:00
parent 03304003af
commit 61753540e4
4 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cura/PrinterOutput/NetworkedPrinterOutputDevice.py
View file

@ -37,13 +37,13 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
def _put(self, target: str, data: str, onFinished: Callable):
request = self._createEmptyRequest(target)
self._onFinishedCallbacks[request] = onFinished
self._manager.put(request, data.encode())
reply = self._manager.put(request, data.encode())
self._onFinishedCallbacks[reply.url().toString() + str(reply.operation())] = onFinished
def _get(self, target: str, onFinished: Callable):
request = self._createEmptyRequest(target)
self._onFinishedCallbacks[request] = onFinished
self._manager.get(request)
reply = self._manager.get(request)
self._onFinishedCallbacks[reply.url().toString() + str(reply.operation())] = onFinished
def _delete(self, target: str, onFinished: Callable):
pass
@ -65,8 +65,7 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
def __handleOnFinished(self, reply: QNetworkReply):
self._last_response_time = time()
try:
self._onFinishedCallbacks[reply.request()](reply)
del self._onFinishedCallbacks[reply.request] # Remove the callback.
self._onFinishedCallbacks[reply.url().toString() + str(reply.operation())](reply)
except Exception as e:
print("Something went wrong with callback", e)
pass