Merge pull request #2517 from Ultimaker/CL-460-avahi-connect-detect

CL-460 do not downgrade Cura Connect printer to legacy

plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py

@@ -144,7 +144,7 @@ class NetworkClusterPrinterOutputDevice(NetworkPrinterOutputDevice.NetworkPrinte
         name = self._selected_printer.get("friendly_name")
         if name != self._automatic_printer.get("friendly_name"):
             return name
-        # Return name of cluster master. 
+        # Return name of cluster master.
         return self._properties.get(b"name", b"").decode("utf-8")
 
     def connect(self):

plugins/UM3NetworkPrinting/NetworkPrinterOutputDevicePlugin.py

@@ -31,6 +31,7 @@ class NetworkPrinterOutputDevicePlugin(QObject, OutputDevicePlugin):
         self._zero_conf = None
         self._browser = None
         self._printers = {}
+        self._cluster_printers_seen = {}  # do not forget a cluster printer when we have seen one, to not 'downgrade' from Connect to legacy printer
 
         self._api_version = "1"
         self._api_prefix = "/api/v" + self._api_version + "/"
@@ -218,12 +219,16 @@ class NetworkPrinterOutputDevicePlugin(QObject, OutputDevicePlugin):
     ##  Because the model needs to be created in the same thread as the QMLEngine, we use a signal.
     def addPrinter(self, name, address, properties, force_cluster=False):
         cluster_size = int(properties.get(b"cluster_size", -1))
-        if force_cluster or cluster_size >= 0:
+        was_cluster_before = name in self._cluster_printers_seen
+        if was_cluster_before:
+            Logger.log("d", "Printer [%s] had Cura Connect before, so assume it's still equipped with Cura Connect.", name)
+        if force_cluster or cluster_size >= 0 or was_cluster_before:
             printer = NetworkClusterPrinterOutputDevice.NetworkClusterPrinterOutputDevice(
                 name, address, properties, self._api_prefix, self._plugin_path)
         else:
             printer = NetworkPrinterOutputDevice.NetworkPrinterOutputDevice(name, address, properties, self._api_prefix)
         self._printers[printer.getKey()] = printer
+        self._cluster_printers_seen[printer.getKey()] = name  # Cluster printers that may be temporary unreachable or is rebooted keep being stored here
         global_container_stack = Application.getInstance().getGlobalContainerStack()
         if global_container_stack and printer.getKey() == global_container_stack.getMetaDataEntry("um_network_key"):
             if printer.getKey() not in self._old_printers:  # Was the printer already connected, but a re-scan forced?