_all_appliances(): reorder code, all checks first

Author: bouwew

plugwise/helper.py

@@ -109,13 +109,6 @@ def _all_appliances(self) -> None:
             if appl.pwclass == "open_therm_gateway":
                 continue
 
-            # Extend device_class name of Plugs (Plugwise and Aqara) - Pw-Beta Issue #739
-            description = appliance.find("description").text
-            if description is not None and (
-                "ZigBee protocol" in description or "smart plug" in description
-            ):
-                appl.pwclass = f"{appl.pwclass}_plug"
-
             # Skip thermostats that have this key, should be an orphaned device (Core #81712)
             if (
                 appl.pwclass == "thermostat"
@@ -146,7 +139,14 @@ def _all_appliances(self) -> None:
             appl.zigbee_mac = None
             appl.vendor_name = None
 
+            # Extend device_class name of Plugs (Plugwise and Aqara) - Pw-Beta Issue #739
+            description = appliance.find("description").text
+            if description is not None and (
+                "ZigBee protocol" in description or "smart plug" in description
+            ):
+                appl.pwclass = f"{appl.pwclass}_plug"
             # Collect appliance info, skip orphaned/removed devices
+
             if not (appl := self._appliance_info_finder(appl, appliance)):
                 continue