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

Merge pull request #2544 from Ultimaker/revert-2542-CL-523

Browse Source 
Revert "CL-523: Made sure printers are present before printjobs to avoid referring to…"
This commit is contained in:
jack 2017-10-02 16:37:45 +02:00 committed by GitHub
commit 4fc279fa39
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py
View File

@ -173,19 +173,18 @@ 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,8 +489,7 @@ 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:
# don't report on yet unknown printers printer_name = i18n_catalog.i18nc("@info:status", "Unknown printer")
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"]))