More fixing after rebase

Author: bouwew

plugwise/common.py

@@ -215,7 +215,7 @@ def _get_groups(self) -> None:
                 and self.gw_entities[group_id]["name"] == group_name
             ):
                 continue
-            
+
             group_type = group.find("type").text
             group_appliances = group.findall("appliances/appliance")
             for item in group_appliances:

plugwise/helper.py

@@ -243,6 +243,14 @@ def _get_locations(self) -> None:
             loc.loc_id = location.get("id")
             loc.name = location.find("name").text
             loc._type = location.find("type").text
+            # Home location is of type building
+            if loc._type == "building":
+                counter += 1
+                self._home_loc_id = loc.loc_id
+                self._home_location = self._domain_objects.find(
+                    f"./location[@id='{loc.loc_id}']"
+                )
+
             self._new_locations.append(loc.loc_id)
             if (
                 loc.loc_id in self._existing_locations
@@ -256,13 +264,6 @@ def _get_locations(self) -> None:
                 "primary_prio": 0,
                 "secondary": [],
             }
-            # Home location is of type building
-            if loc._type == "building":
-                counter += 1
-                self._home_loc_id = loc.loc_id
-                self._home_location = self._domain_objects.find(
-                    f"./location[@id='{loc.loc_id}']"
-                )
 
         removed = list(set(self._existing_locations) - set(self._new_locations))
         if self._existing_locations and removed:

plugwise/legacy/helper.py

@@ -108,6 +108,7 @@ def _get_appliances(self) -> None:
             appl.mac = None
             appl.model = appl.pwclass.replace("_", " ").title()
             appl.model_id = None
+            appl.module_id = None
             appl.name = appliance.find("name").text
             appl.vendor_name = None
             appl.zigbee_mac = None