Improve _get_appliances() logic

Author: bouwew

plugwise/common.py

@@ -208,12 +208,10 @@ def _get_groups(self) -> None:
             if group_id is None:
                 continue  # pragma: no cover
 
-            self._new_groups.append(group_id)
-            if (
-                (members := self._collect_members(group))
-                and group_id in self._existing_groups
-                and self.gw_entities[group_id]["name"] == group_name
-            ):
+            members = self._collect_members(group)
+            if group_id not in self._existing_groups and members:
+                self._new_groups.append(group_id)
+            elif self.gw_entities[group_id]["name"] == group_name
                 continue
 
             group_type = group.find("type").text
@@ -226,9 +224,6 @@ def _get_groups(self) -> None:
                     "vendor": "Plugwise",
                 }
                 self._count += 5
-            elif group_id in self._existing_groups:
-                # Group existed but now has no valid members ->  remove
-                self._new_groups.remove(group_id)
 
         removed = list(set(self._existing_groups) - set(self._new_groups))
         if self._existing_groups and removed:

plugwise/helper.py

@@ -157,15 +157,19 @@ def _get_appliances(self) -> bool:
 
             extend_plug_device_class(appl, appliance)
 
-            self._new_appliances.append(appl.entity_id)
-            if appl.entity_id in self._existing_appliances and (
+            if appl.entity_id not in self._existing_appliances:
+                self._new_appliances.append(appl.entity_id)
+            elif (
                 appl.pwclass in ("gateway", "heater_central")
                 or self.gw_entities[appl.entity_id]["name"] == appl.name
             ):
                 continue
 
             # Collect appliance info, skip orphaned/removed devices
-            if not (appl := self._appliance_info_finder(appl, appliance)):
+            if not (
+                appl := self._appliance_info_finder(appl, appliance)
+                and appl.entity_id in self._new_appliances
+            ):
                 self._new_appliances.pop()
                 continue