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

Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0""

Browse source 
This reverts commit e07e7bc9e7.

Contributes to issue CURA-4414.
This commit is contained in:
Ghostkeeper 2017-10-05 10:58:49 +02:00
parent ff41b043b1
commit d458fcde5c
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
12 changed files with 75 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py
View file

@ -27,6 +27,7 @@ import zlib
from time import time
from time import sleep
from time import gmtime
i18n_catalog = i18nCatalog("cura")
@ -1132,6 +1133,11 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
else:
Logger.log("w", "Unable to save authentication for id %s and key %s", self._authentication_id, self._getSafeAuthKey())
# Request 'system' printer data once, when we know we have authentication, so we know we can set the system time.
url = QUrl("http://" + self._address + self._api_prefix + "system")
system_data_request = QNetworkRequest(url)
self._manager.get(system_data_request)
else: # Got a response that we didn't expect, so something went wrong.
Logger.log("e", "While trying to authenticate, we got an unexpected response: %s", reply.attribute(QNetworkRequest.HttpStatusCodeAttribute))
self.setAuthenticationState(AuthState.NotAuthenticated)
@ -1151,6 +1157,27 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
else:
pass
elif self._api_prefix + "system" in reply_url:
# Check if the printer has time, and if this has a valid system time.
try:
data = json.loads(bytes(reply.readAll()).decode("utf-8"))
except json.decoder.JSONDecodeError:
Logger.log("w", "Received an invalid authentication request reply from printer: Not valid JSON.")
return
if "time" in data and "utc" in data["time"]:
try:
printer_time = gmtime(float(data["time"]["utc"]))
Logger.log("i", "Printer has system time of: %s", str(printer_time))
except ValueError:
printer_time = None
if printer_time is not None and printer_time.tm_year < 1990:
# The system time is not valid, sync our current system time to it, so we at least have some reasonable time in the printer.
Logger.log("w", "Printer system time invalid, setting system time")
url = QUrl("http://" + self._address + self._api_prefix + "system/time/utc")
put_request = QNetworkRequest(url)
put_request.setHeader(QNetworkRequest.ContentTypeHeader, "application/json")
self._manager.put(put_request, str(time()).encode())
elif reply.operation() == QNetworkAccessManager.PostOperation:
if "/auth/request" in reply_url:
# We got a response to requesting authentication.