GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 15:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'network_rewrite' of github.com:Ultimaker/Cura into network_rewrite

Browse Source
This commit is contained in:
Jaime van Kessel 2018-01-04 12:55:08 +01:00
commit fc3a47cb7b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cura/PrinterOutput/NetworkedPrinterOutputDevice.py
View File

@ -45,7 +45,9 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
self._onFinishedCallbacks = {} # type: Dict[str, Callable[[QNetworkReply], None]] self._onFinishedCallbacks = {} # type: Dict[str, Callable[[QNetworkReply], None]]
self._authentication_state = AuthState.NotAuthenticated self._authentication_state = AuthState.NotAuthenticated
self._cached_multiparts = {} # type: Dict[int, Tuple[QHttpMultiPart, QNetworkReply]] # QHttpMultiPart objects need to be kept alive and not garbage collected during the
# HTTP which uses them. We hold references to these QHttpMultiPart objects here.
self._live_multiparts = {} # type: Dict[QNetworkReply, QHttpMultiPart]
self._sending_gcode = False self._sending_gcode = False
self._compressing_gcode = False self._compressing_gcode = False
@ -170,8 +172,8 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
return "Unknown User" # Couldn't find out username. return "Unknown User" # Couldn't find out username.
def _clearCachedMultiPart(self, reply: QNetworkReply) -> None: def _clearCachedMultiPart(self, reply: QNetworkReply) -> None:
if id(reply) in self._cached_multiparts: if reply in self._live_multiparts:
del self._cached_multiparts[id(reply)] del self._live_multiparts[reply]
def put(self, target: str, data: str, onFinished: Optional[Callable[[Any, QNetworkReply], None]]) -> None: def put(self, target: str, data: str, onFinished: Optional[Callable[[Any, QNetworkReply], None]]) -> None:
if self._manager is None: if self._manager is None:
@ -219,7 +221,7 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
reply = self._manager.post(request, multi_post_part) reply = self._manager.post(request, multi_post_part)
self._cached_multiparts[id(reply)] = (multi_post_part, reply) self._live_multiparts[reply] = multi_post_part
if onProgress is not None: if onProgress is not None:
reply.uploadProgress.connect(onProgress) reply.uploadProgress.connect(onProgress)