Add existing/new detection in _get_locations() and related

Author: bouwew

plugwise/helper.py

@@ -74,7 +74,9 @@ def __init__(self) -> None:
         """Set the constructor for this class."""
         super().__init__()
         self._existing_appliances: list[str] = []
+        self._existing_locations: list[str] = []
         self._new_appliances: list[str] = []
+        self._new_locations: list[str] = []
         self._endpoint: str
         self._elga: bool
         self._is_thermostat: bool
@@ -222,8 +224,12 @@ def _get_locations(self) -> None:
         loc = Munch()
         locations = self._domain_objects.findall("./location")
         for location in locations:
-            loc.name = location.find("name").text
             loc.loc_id = location.attrib["id"]
+            self._new_locations.append(loc.loc_id)
+            if loc.loc_id in self._existing_locations:
+                continue
+
+            loc.name = location.find("name").text
             self._loc_data[loc.loc_id] = {"name": loc.name}
             if loc.name != "Home":
                 continue
@@ -233,6 +239,15 @@ def _get_locations(self) -> None:
                 f"./location[@id='{loc.loc_id}']"
             )
 
+        removed = list(set(self._existing_locations) - set(self._new_locations))
+        if self._existing_locations and removed:
+            for location_id in removed:
+                self._loc_data.pop(location_id)
+                self._zones.pop(location_id)
+
+        self._existing_locations = self._new_locations
+        self._new_locations = []
+
     def _appliance_info_finder(self, appl: Munch, appliance: etree.Element) -> Munch:
         """Collect info for all appliances found."""
         match appl.pwclass:
@@ -779,7 +794,8 @@ def _scan_thermostats(self) -> None:
         the result to update the device_class of secondary thermostats.
         """
         self._match_and_rank_thermostats()
-        for location_id, location in self._loc_data.items():
+        for location_id in self._new_locations:
+            location = self._loc_data[location_id]
             if location["primary_prio"] != 0:
                 self._zones[location_id] = {
                     "dev_class": "climate",
@@ -804,7 +820,8 @@ def _match_and_rank_thermostats(self) -> dict[str, ThermoLoc]:
             "zone_thermostat": 2,
             "thermostatic_radiator_valve": 1,
         }
-        for location_id, location in self._loc_data.items():
+        for location_id in self._new_locations:
+            location = self._loc_data[location_id]
             location.update({"primary": [], "primary_prio": 0, "secondary": []})
             for entity_id, entity in self.gw_entities.items():
                 self._rank_thermostat(