Some fixes and cleanup for the network plugin

plugins/UM3NetworkPrinting/src/Network/ClusterApiClient.py

@@ -39,7 +39,7 @@ class ClusterApiClient:
     ## Get printer system information.
     #  \param on_finished: The callback in case the response is successful.
     def getSystem(self, on_finished: Callable) -> None:
-        url = "{}/system/".format(self.PRINTER_API_PREFIX)
+        url = "{}/system".format(self.PRINTER_API_PREFIX)
         reply = self._manager.get(self._createEmptyRequest(url))
         self._addCallback(reply, on_finished, PrinterSystemStatus)
 
@@ -59,17 +59,17 @@ class ClusterApiClient:
 
     ## Move a print job to the top of the queue.
     def movePrintJobToTop(self, print_job_uuid: str) -> None:
-        url = "{}/print_jobs/{}/action/move".format(self.CLUSTER_API_PREFIX, print_job_uuid)
+        url = "{}/print_jobs/{}/action/move/".format(self.CLUSTER_API_PREFIX, print_job_uuid)
         self._manager.post(self._createEmptyRequest(url), json.dumps({"to_position": 0, "list": "queued"}).encode())
 
     ## Delete a print job from the queue.
     def deletePrintJob(self, print_job_uuid: str) -> None:
-        url = "{}/print_jobs/{}".format(self.CLUSTER_API_PREFIX, print_job_uuid)
+        url = "{}/print_jobs/{}/".format(self.CLUSTER_API_PREFIX, print_job_uuid)
         self._manager.deleteResource(self._createEmptyRequest(url))
 
     ## Set the state of a print job.
     def setPrintJobState(self, print_job_uuid: str, state: str) -> None:
-        url = "{}/print_jobs/{}/action".format(self.CLUSTER_API_PREFIX, print_job_uuid)
+        url = "{}/print_jobs/{}/action/".format(self.CLUSTER_API_PREFIX, print_job_uuid)
         # We rewrite 'resume' to 'print' here because we are using the old print job action endpoints.
         action = "print" if state == "resume" else state
         self._manager.put(self._createEmptyRequest(url), json.dumps({"action": action}).encode())
@@ -111,14 +111,17 @@ class ClusterApiClient:
                      on_finished: Union[Callable[[ClusterApiClientModel], Any],
                                         Callable[[List[ClusterApiClientModel]], Any]],
                      model_class: Type[ClusterApiClientModel]) -> None:
-        if isinstance(response, list):
-            results = [model_class(**c) for c in response]  # type: List[ClusterApiClientModel]
-            on_finished_list = cast(Callable[[List[ClusterApiClientModel]], Any], on_finished)
-            on_finished_list(results)
-        else:
-            result = model_class(**response)  # type: ClusterApiClientModel
-            on_finished_item = cast(Callable[[ClusterApiClientModel], Any], on_finished)
-            on_finished_item(result)
+        try:
+            if isinstance(response, list):
+                results = [model_class(**c) for c in response]  # type: List[ClusterApiClientModel]
+                on_finished_list = cast(Callable[[List[ClusterApiClientModel]], Any], on_finished)
+                on_finished_list(results)
+            else:
+                result = model_class(**response)  # type: ClusterApiClientModel
+                on_finished_item = cast(Callable[[ClusterApiClientModel], Any], on_finished)
+                on_finished_item(result)
+        except JSONDecodeError:
+            Logger.log("e", "Could not parse response from network: %s", str(response))
 
     ## Creates a callback function so that it includes the parsing of the response into the correct model.
     #  The callback is added to the 'finished' signal of the reply.

plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py

@@ -12,6 +12,9 @@ from UM.i18n import i18nCatalog
 from UM.Scene.SceneNode import SceneNode
 from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState
 from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
+from plugins.UM3NetworkPrinting.src.Messages.PrintJobUploadBlockedMessage import PrintJobUploadBlockedMessage
+from plugins.UM3NetworkPrinting.src.Messages.PrintJobUploadErrorMessage import PrintJobUploadErrorMessage
+from plugins.UM3NetworkPrinting.src.Messages.PrintJobUploadSuccessMessage import PrintJobUploadSuccessMessage
 
 from .ClusterApiClient import ClusterApiClient
 from ..ExportFileJob import ExportFileJob
@@ -46,7 +49,6 @@ class LocalClusterOutputDevice(UltimakerNetworkedPrinterOutputDevice):
     ##  Set all the interface elements and texts for this output device.
     def _setInterfaceElements(self) -> None:
         self.setPriority(3)  # Make sure the output device gets selected above local file output
-        self.setName(self._id)
         self.setShortDescription(I18N_CATALOG.i18nc("@action:button Preceded by 'Ready to'.", "Print over network"))
         self.setDescription(I18N_CATALOG.i18nc("@properties:tooltip", "Print over network"))
         self.setConnectionText(I18N_CATALOG.i18nc("@info:status", "Connected over the network"))
@@ -111,11 +113,8 @@ class LocalClusterOutputDevice(UltimakerNetworkedPrinterOutputDevice):
 
         # Show an error message if we're already sending a job.
         if self._progress.visible:
-            return Message(
-                text=I18N_CATALOG.i18nc("@info:status", "Please wait until the current job has been sent."),
-                title=I18N_CATALOG.i18nc("@info:title", "Print error"),
-                lifetime=10
-            ).show()
+            PrintJobUploadBlockedMessage().show()
+            return
 
         self.writeStarted.emit(self)
 
@@ -147,22 +146,14 @@ class LocalClusterOutputDevice(UltimakerNetworkedPrinterOutputDevice):
     ## Handler for when the print job was fully uploaded to the cluster.
     def _onPrintUploadCompleted(self, _: QNetworkReply) -> None:
         self._progress.hide()
-        Message(
-            text=I18N_CATALOG.i18nc("@info:status", "Print job was successfully sent to the printer."),
-            title=I18N_CATALOG.i18nc("@info:title", "Data Sent"),
-            lifetime=5
-        ).show()
+        PrintJobUploadSuccessMessage().show()
         self.writeFinished.emit()
 
     ## Displays the given message if uploading the mesh has failed
     #  \param message: The message to display.
     def _onUploadError(self, message: str = None) -> None:
         self._progress.hide()
-        Message(
-            text=message or I18N_CATALOG.i18nc("@info:text", "Could not upload the data to the printer."),
-            title=I18N_CATALOG.i18nc("@info:title", "Network error"),
-            lifetime=10
-        ).show()
+        PrintJobUploadErrorMessage(message).show()
         self.writeError.emit()
 
     ## Download all the images from the cluster and load their data in the print job models.

plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py

@@ -110,6 +110,7 @@ class LocalClusterOutputDeviceManager:
     ## Callback for when a manual device check request was responded to.
     def _onCheckManualDeviceResponse(self, address: str, status: PrinterSystemStatus) -> None:
         callback = self._manual_instances.get(address, None)
+        print("status", status)
         if callback is None:
             return
         self._onDeviceDiscovered("manual:{}".format(address), address, {