Improve code-placement, simplify argument names

Author: bouwew

plugwise/helper.py

@@ -778,19 +778,7 @@ def _scan_thermostats(self) -> None:
         Update locations with thermostat ranking results and use
         the result to update the device_class of secondary thermostats.
         """
-        self._thermo_locs = self._match_locations()
-
-        thermo_matching: dict[str, int] = {
-            "thermostat": 2,
-            "zone_thermometer": 2,
-            "zone_thermostat": 2,
-            "thermostatic_radiator_valve": 1,
-        }
-
-        for loc_id in self._thermo_locs:
-            for entity_id, entity in self.gw_entities.items():
-                self._rank_thermostat(thermo_matching, loc_id, entity_id, entity)
-
+        self._thermo_locs = self._match_and_rank_thermostats()
         for loc_id, loc_data in self._thermo_locs.items():
             if loc_data["primary_prio"] != 0:
                 self._zones[loc_id] = {
@@ -805,40 +793,52 @@ def _scan_thermostats(self) -> None:
                 }
                 self._count += 5
 
-    def _match_locations(self) -> dict[str, ThermoLoc]:
+    def _match_and_rank_thermostats(self) -> dict[str, ThermoLoc]:
         """Helper-function for _scan_thermostats().
 
-        Match appliances with locations.
+        Match thermostat-appliances with locations, rank them for locations with multiple thermostats.
         """
         matched_locations: dict[str, ThermoLoc] = {}
+        thermo_matching: dict[str, int] = {
+            "thermostat": 2,
+            "zone_thermometer": 2,
+            "zone_thermostat": 2,
+            "thermostatic_radiator_valve": 1,
+        }
         for location_id, location_details in self._loc_data.items():
-            for appliance_details in self.gw_entities.values():
-                if appliance_details["location"] == location_id:
+            # for gw_entity_details in self.gw_entities.values():
+            for entity_id, entity in self.gw_entities.items():
+                if entity["location"] == location_id:
                     location_details.update(
                         {"primary": [], "primary_prio": 0, "secondary": []}
                     )
                     matched_locations[location_id] = location_details
 
+        for loc_id in matched_locations:
+            for entity_id, entity in self.gw_entities.items():
+                self._rank_thermostat(entity_id, entity, loc_id, matched_locations, thermo_matching)
+
         return matched_locations
 
     def _rank_thermostat(
         self,
-        thermo_matching: dict[str, int],
+        entity_id: str,
+        entity: GwEntityData,
         loc_id: str,
-        appliance_id: str,
-        appliance_details: GwEntityData,
+        matched_locations: dict[str, ThermoLoc],
+        thermo_matching: dict[str, int],
     ) -> None:
         """Helper-function for _scan_thermostats().
 
-        Rank the thermostat based on appliance_details: primary or secondary.
-        Note: there can be several primary and secondary thermostats.
+        Rank the thermostat based on entity-thermostat-type: primary or secondary.
+        There can be one primary and several secondary thermostats per location.
         """
-        appl_class = appliance_details["dev_class"]
-        appl_d_loc = appliance_details["location"]
-        thermo_loc = self._thermo_locs[loc_id]
+        appl_class = entity["dev_class"]
+        appl_d_loc = entity["location"]
+        thermo_loc = matched_locations[loc_id]
         if loc_id == appl_d_loc and appl_class in thermo_matching:
             if thermo_matching[appl_class] == thermo_loc["primary_prio"]:
-                thermo_loc["primary"].append(appliance_id)
+                thermo_loc["primary"].append(entity_id)
             # Pre-elect new primary
             elif (thermo_rank := thermo_matching[appl_class]) > thermo_loc[
                 "primary_prio"
@@ -850,9 +850,9 @@ def _rank_thermostat(
                     thermo_loc["primary"] = []
 
                 # Crown primary
-                thermo_loc["primary"].append(appliance_id)
+                thermo_loc["primary"].append(entity_id)
             else:
-                thermo_loc["secondary"].append(appliance_id)
+                thermo_loc["secondary"].append(entity_id)
 
     def _control_state(self, data: GwEntityData) -> str | bool:
         """Helper-function for _get_location_data().