diff --git a/NetworkPrinterOutputDevice.py b/NetworkPrinterOutputDevice.py index 94cc689940..28a25de4f8 100644 --- a/NetworkPrinterOutputDevice.py +++ b/NetworkPrinterOutputDevice.py @@ -77,6 +77,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice): self._progress_message = None self._error_message = None + self._connection_message = None self._update_timer = QTimer() self._update_timer.setInterval(2000) # TODO; Add preference for update interval @@ -190,12 +191,15 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice): # Go into timeout state. Logger.log("d", "We did not receive a response for %s seconds, so it seems the printer is no longer accesible.", time() - self._last_response_time) self._connection_state_before_timeout = self._connection_state + self._connection_message = Message(i18n_catalog.i18nc("@info:status", "The connection with the printer was lost.Check your network-connections.")) + self._connection_message.show() self.setConnectionState(ConnectionState.error) if self._authentication_state == AuthState.NotAuthenticated: self._verifyAuthentication() # We don't know if we are authenticated; check if we have correct auth. elif self._authentication_state == AuthState.AuthenticationRequested: self._checkAuthentication() # We requested authentication at some point. Check if we got permission. + ## Request 'general' printer data url = QUrl("http://" + self._address + self._api_prefix + "printer") printer_request = QNetworkRequest(url) @@ -423,6 +427,10 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice): self._last_response_time = time() status_code = reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) + if not status_code: + # Received no or empty reply + return + if reply.operation() == QNetworkAccessManager.GetOperation: if "printer" in reply.url().toString(): # Status update from printer. if status_code == 200: @@ -431,6 +439,11 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice): self._json_printer_state = json.loads(bytes(reply.readAll()).decode("utf-8")) self._spliceJSONData() + + # Hide connection error message if the connection was restored + if self._connection_message: + self._connection_message.hide() + self._connection_message = None else: Logger.log("w", "We got an unexpected status (%s) while requesting printer state", status_code) pass # TODO: Handle errors @@ -515,7 +528,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice): elif "print_job" in reply.url().toString(): reply.uploadProgress.disconnect(self._onUploadProgress) self._progress_message.hide() - + elif reply.operation() == QNetworkAccessManager.PutOperation: if status_code == 204: pass # Request was successful!