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

Made sure printers are present before printjobs to avoid referring to unknown printers

Browse source 
CL-523

Signed-off-by: Robin den Hertog <r.denhertog@ultimaker.com>
This commit is contained in:
Robin den Hertog 2017-10-02 16:20:02 +02:00
parent 189fc3fe94
commit a9c732e624
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py
View file

@ -174,18 +174,19 @@ class NetworkClusterPrinterOutputDevice(NetworkPrinterOutputDevice.NetworkPrinte
def _requestClusterStatus(self): def _requestClusterStatus(self):
# TODO: Handle timeout. We probably want to know if the cluster is still reachable or not. # TODO: Handle timeout. We probably want to know if the cluster is still reachable or not.
url = QUrl(self._api_base_uri + "print_jobs/")
print_jobs_request = QNetworkRequest(url)
self._addUserAgentHeader(print_jobs_request)
self._manager.get(print_jobs_request)
# See _finishedPrintJobsRequest()
url = QUrl(self._api_base_uri + "printers/") url = QUrl(self._api_base_uri + "printers/")
printers_request = QNetworkRequest(url) printers_request = QNetworkRequest(url)
self._addUserAgentHeader(printers_request) self._addUserAgentHeader(printers_request)
self._manager.get(printers_request) self._manager.get(printers_request)
# See _finishedPrintersRequest() # See _finishedPrintersRequest()
if self._printers: # if printers is not empty
url = QUrl(self._api_base_uri + "print_jobs/")
print_jobs_request = QNetworkRequest(url)
self._addUserAgentHeader(print_jobs_request)
self._manager.get(print_jobs_request)
# See _finishedPrintJobsRequest()
def _finishedPrintJobsRequest(self, reply): def _finishedPrintJobsRequest(self, reply):
try: try:
json_data = json.loads(bytes(reply.readAll()).decode("utf-8")) json_data = json.loads(bytes(reply.readAll()).decode("utf-8"))
@ -490,7 +491,8 @@ class NetworkClusterPrinterOutputDevice(NetworkPrinterOutputDevice.NetworkPrinte
printer_name = self.__getPrinterNameFromUuid(print_job["assigned_to"]) printer_name = self.__getPrinterNameFromUuid(print_job["assigned_to"])
if printer_name is None: if printer_name is None:
printer_name = i18n_catalog.i18nc("@info:status", "Unknown printer") # don't report on yet unknown printers
continue
message_text = (i18n_catalog.i18n("{printer_name} is reserved to print '{job_name}'. Please change the printer's configuration to match the job, for it to start printing.") message_text = (i18n_catalog.i18n("{printer_name} is reserved to print '{job_name}'. Please change the printer's configuration to match the job, for it to start printing.")
.format(printer_name=printer_name, job_name=print_job["name"])) .format(printer_name=printer_name, job_name=print_job["name"]))