Improve/rework _get_groups()

Author: bouwew

plugwise/common.py

@@ -54,7 +54,9 @@ def __init__(self) -> None:
         self._cooling_present: bool
         self._count: int
         self._domain_objects: etree.Element
+        self._existing_groups: list[str] = []
         self._heater_id: str = NONE
+        self._new_groups: list[st] = []
         self._on_off_device: bool
         self.gw_entities: dict[str, GwEntityData] = {}
         self.smile: Munch
@@ -191,19 +193,22 @@ def _entity_switching_group(self, entity: GwEntityData, data: GwEntityData) -> N
             data["switches"]["relay"] = counter != 0
             self._count += 1
 
-    def _get_groups(self) -> dict[str, GwEntityData]:
+    def _get_groups(self) -> None:
         """Helper-function for smile.py: get_all_gateway_entities().
 
         Collect switching-, pumping- or report-group info.
         """
-        groups: dict[str, GwEntityData] = {}
         # P1 and Anna don't have groups
         if self.smile.type == "power" or self.check_name(ANNA):
-            return groups
+            return
 
         for group in self._domain_objects.findall("./group"):
             members: list[str] = []
             group_id = group.attrib["id"]
+            self._new_groups.append(group_id)
+            if group_id in self._existing_appliances:
+                continue
+
             group_name = group.find("name").text
             group_type = group.find("type").text
             group_appliances = group.findall("appliances/appliance")
@@ -213,7 +218,7 @@ def _get_groups(self) -> dict[str, GwEntityData]:
                     members.append(item.attrib["id"])
 
             if group_type in GROUP_TYPES and members:
-                groups[group_id] = {
+                self.gw_entities[group_id] = {
                     "dev_class": group_type,
                     "model": "Group",
                     "name": group_name,
@@ -222,7 +227,13 @@ def _get_groups(self) -> dict[str, GwEntityData]:
                 }
                 self._count += 5
 
-        return groups
+        removed = list(set(self._existing_groups) - set(self._new_groups))
+        if self._existing_groups and removed:
+            for group in removed:
+                self.gw_entities.pop(group)
+
+        self._existing_groups = self._new_groups
+        self._new_groups = []
 
     def _get_lock_state(
         self, xml: etree.Element, data: GwEntityData, stretch_v2: bool = False

plugwise/smile.py

@@ -119,8 +119,7 @@ def get_all_gateway_entities(self) -> None:
                 if self.check_name(ADAM):
                     self._scan_thermostats()
 
-            if group_data := self._get_groups():
-                self.gw_entities.update(group_data)
+        self._get_groups()
 
         self._all_entity_data()