_get_p1_smartmeter_info(): use already known home-location

Author: bouwew

plugwise/helper.py

@@ -233,7 +233,8 @@ def __init__(self) -> None:
         self._elga: bool
         self._gw_allowed_modes: list[str] = []
         self._heater_id: str
-        self._home_location: str
+        self._home_loc_id: str
+        self._home_location: etree
         self._is_thermostat: bool
         self._last_active: dict[str, str | None]
         self._last_modified: dict[str, str] = {}
@@ -311,10 +312,10 @@ def _all_appliances(self) -> None:
             appl.location = None
             if (appl_loc := appliance.find("location")) is not None:
                 appl.location = appl_loc.attrib["id"]
-            # Don't assign the _home_location to thermostat-devices without a location,
+            # Don't assign the _home_loc_id to thermostat-devices without a location,
             # they are not active
             elif appl.pwclass not in THERMOSTAT_CLASSES:
-                appl.location = self._home_location
+                appl.location = self._home_loc_id
 
             # Don't show orphaned thermostat-types
             if appl.pwclass in THERMOSTAT_CLASSES and appl.location is None:
@@ -338,7 +339,6 @@ def _all_appliances(self) -> None:
             self._create_gw_entities(appl)
 
         if self.smile_type == "power":
-            LOGGER.debug("HOI home-loc: %s", self._home_location)
             self._get_p1_smartmeter_info()
 
         # Sort the gw_entities
@@ -351,23 +351,16 @@ def _get_p1_smartmeter_info(self) -> None:
         switched to maintain backward compatibility with existing implementations.
         """
         appl = Munch()
-        loc_id = next(iter(self._loc_data.keys()))
-        LOGGER.debug("HOI loc_id: %s", loc_id)
-        if (
-            location := self._domain_objects.find(f'./location[@id="{loc_id}"]')
-        ) is None:
-            return
-
         locator = MODULE_LOCATOR
-        module_data = self._get_module_data(location, locator)
+        module_data = self._get_module_data(self._home_location, locator)
         if not module_data["contents"]:
             LOGGER.error("No module data found for SmartMeter")  # pragma: no cover
             return  # pragma: no cover
         appl.available = None
         appl.entity_id = self.gateway_id
         appl.firmware = module_data["firmware_version"]
         appl.hardware = module_data["hardware_version"]
-        appl.location = loc_id
+        appl.location = self._home_loc_id
         appl.mac = None
         appl.model = module_data["vendor_model"]
         appl.model_id = None  # don't use model_id for SmartMeter
@@ -377,8 +370,8 @@ def _get_p1_smartmeter_info(self) -> None:
         appl.zigbee_mac = None
 
         # Replace the entity_id of the gateway by the smartmeter location_id
-        self.gw_entities[loc_id] = self.gw_entities.pop(self.gateway_id)
-        self.gateway_id = loc_id
+        self.gw_entities[self._home_loc_id] = self.gw_entities.pop(self.gateway_id)
+        self.gateway_id = self._home_loc_id
 
         self._create_gw_entities(appl)
 
@@ -400,10 +393,14 @@ def _all_locations(self) -> None:
         for location in locations:
             loc.name = location.find("name").text
             loc.loc_id = location.attrib["id"]
-            if loc.name == "Home":
-                self._home_location = loc.loc_id
-
             self._loc_data[loc.loc_id] = {"name": loc.name}
+            if loc.name != "Home":
+                continue
+
+            self._home_loc_id = loc.loc_id
+            self._home_location = self._domain_objects.find(
+                f"./location[@id='{loc.loc_id}']"
+            )
 
     def _appliance_info_finder(self, appl: Munch, appliance: etree) -> Munch:
         """Collect info for all appliances found."""
@@ -772,7 +769,7 @@ def _get_gateway_outdoor_temp(self, entity_id: str, data: GwEntityData) -> None:
         """
         if self._is_thermostat and entity_id == self.gateway_id:
             outdoor_temperature = self._object_value(
-                self._home_location, "outdoor_temperature"
+                self._home_loc_id, "outdoor_temperature"
             )
             if outdoor_temperature is not None:
                 data.update({"sensors": {"outdoor_temperature": outdoor_temperature}})