Add existing/new detection for zones

Author: bouwew

plugwise/helper.py

@@ -75,8 +75,10 @@ def __init__(self) -> None:
         super().__init__()
         self._existing_appliances: list[str] = []
         self._existing_locations: list[str] = []
+        self._existing_zones: list[str] = []
         self._new_appliances: list[str] = []
         self._new_locations: list[str] = []
+        self._new_zones: list[str] = []
         self._endpoint: str
         self._elga: bool
         self._is_thermostat: bool
@@ -794,9 +796,14 @@ def _scan_thermostats(self) -> None:
         the result to update the device_class of secondary thermostats.
         """
         self._match_and_rank_thermostats()
-        for location_id in self._new_locations:
-            location = self._loc_data[location_id]
+        # for location_id in self._new_locations:
+        #     location = self._loc_data[location_id]
+        for location_id, location in self._loc_data.items():
             if location["primary_prio"] != 0:
+                self._new_zones.append(location_id)
+                if location_id in self._existing_zones:
+                    continue
+
                 self._zones[location_id] = {
                     "dev_class": "climate",
                     "model": "ThermoZone",
@@ -809,6 +816,14 @@ def _scan_thermostats(self) -> None:
                 }
                 self._count += 5
 
+        removed = list(set(self._existing_zones) - set(self._new_zones))
+        if self._existing_zones and removed:
+            for location_id in removed:
+                self._zones.pop(location_id)
+
+        self._existing_zones = self._new_zones
+        self._new_zones = []
+
     def _match_and_rank_thermostats(self) -> dict[str, ThermoLoc]:
         """Helper-function for _scan_thermostats().
 
@@ -820,8 +835,9 @@ def _match_and_rank_thermostats(self) -> dict[str, ThermoLoc]:
             "zone_thermostat": 2,
             "thermostatic_radiator_valve": 1,
         }
-        for location_id in self._new_locations:
-            location = self._loc_data[location_id]
+        # for location_id in self._new_locations:
+        #     location = self._loc_data[location_id]
+        for location_id, location in self._loc_data.items():
             location.update({"primary": [], "primary_prio": 0, "secondary": []})
             for entity_id, entity in self.gw_entities.items():
                 self._rank_thermostat(