Implement suggested improvements

Author: bouwew

plugwise/constants.py

@@ -85,7 +85,7 @@
 MODULE_LOCATOR: Final = "./logs/point_log/*[@id]"
 NONE: Final = "None"
 OFF: Final = "off"
-PRIORITY_DEVICE_CLASSES = ("heater_central", "gateway")
+PRIORITY_DEVICE_CLASSES = ("gateway", "heater_central")
 
 # XML data paths
 APPLIANCES: Final = "/core/appliances"

plugwise/helper.py

@@ -382,14 +382,14 @@ def _get_p1_smartmeter_info(self) -> None:
 
     def _sort_gw_entities(self) -> None:
         """Place the gateway and optional heater_central entities as 1st and 2nd."""
-        for dev_class in PRIORITY_DEVICE_CLASSES:
-            for entity_id, entity in dict(self.gw_entities).items():
-                if entity["dev_class"] == dev_class:
-                    priority_entity = entity
-                    self.gw_entities.pop(entity_id)
-                    other_entities = self.gw_entities
-                    priority_entities = {entity_id: priority_entity}
-                    self.gw_entities = {**priority_entities, **other_entities}
+        def sort_key(item):
+            entity_id, entity = item
+            try:
+                return PRIORITY_DEVICE_CLASSES.index(entity["dev_class"])
+            except ValueError:
+                return len(PRIORITY_DEVICE_CLASSES)
+
+        self.gw_entities = dict(sorted(self.gw_entities.items(), key=sort_key))
 
     def _all_locations(self) -> None:
         """Collect all locations."""
@@ -813,13 +813,10 @@ def _process_on_off_device_c_heating_state(self, data: GwEntityData) -> None:
         if self.smile(ADAM):
             # First count when not present, then create and init to False.
             # When present init to False
-            if "heating_state" not in data["binary_sensors"]:
-                self._count += 1
-            data["binary_sensors"]["heating_state"] = False
-
-            if "cooling_state" not in data["binary_sensors"]:
-                self._count += 1
-            data["binary_sensors"]["cooling_state"] = False
+            for state in ["heating_state", "cooling_state"]:
+                if state not in data["binary_sensors"]:
+                    self._count += 1
+                data["binary_sensors"][state] = False
 
             if self._cooling_enabled:
                 data["binary_sensors"]["cooling_state"] = data["c_heating_state"]