Optimize _get_groups(), fix group_id

Author: bouwew

plugwise/common.py

@@ -188,15 +188,15 @@ def _entity_switching_group(self, entity: GwEntityData) -> None:
             entity["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] = []
@@ -210,7 +210,7 @@ def _get_groups(self) -> dict[str, GwEntityData]:
                     members.append(item.get("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,
@@ -219,8 +219,6 @@ def _get_groups(self) -> dict[str, GwEntityData]:
                 }
                 self._count += 5
 
-        return groups
-
     def _get_lock_state(
         self, xml: etree.Element, data: GwEntityData, stretch_v2: bool = False
     ) -> None:

plugwise/helper.py

@@ -393,12 +393,12 @@ def _get_measurement_data(self, entity_id: str, entity: GwEntityData) -> None:
     def _collect_group_sensors(
         self,
         data: GwEntityData,
-        entity_id: str,
+        group_id: str,
         measurements: dict[str, UOM],
     ) -> None:
         """Collect group sensors."""
         if (
-            group := self._domain_objects.find(f'./group[@id="{entity_id}"]')
+            group := self._domain_objects.find(f'./group[@id="{group_id}"]')
         ) is not None:
             for measurement, attrs in measurements.items():
                 locator = f'.//logs/point_log[type="{measurement}"]/period/measurement'

plugwise/legacy/smile.py

@@ -82,9 +82,7 @@ def get_all_gateway_entities(self) -> None:
         Finally, collect the data and states for each entity.
         """
         self._all_appliances()
-        if group_data := self._get_groups():
-            self.gw_entities.update(group_data)
-
+        self._get_groups()
         self._all_entity_data()
 
     async def async_update(self) -> dict[str, GwEntityData]:

plugwise/smile.py

@@ -113,9 +113,7 @@ def get_all_gateway_entities(self) -> None:
             )
             self._scan_thermostats()
 
-        if group_data := self._get_groups():
-            self.gw_entities.update(group_data)
-
+        self._get_groups()
         self._all_entity_data()
 
     async def async_update(self) -> dict[str, GwEntityData]: