_get_module_data(): add key argument

making it possible to search for a more specific module tag

Author: bouwew

plugwise/common.py

@@ -98,9 +98,9 @@ def _appl_heater_central_info(
         # xml_1: appliance
         # xml_3: self._modules for legacy, self._domain_objects for actual
         xml_3 = return_valid(xml_3, self._domain_objects)
-        module_data = self._get_module_data(xml_1, locator_1, xml_3)
+        module_data = self._get_module_data(xml_1, locator_1, xml_2=xml_3)
         if not module_data["contents"]:
-            module_data = self._get_module_data(xml_1, locator_2, xml_3)
+            module_data = self._get_module_data(xml_1, locator_2, xml_2=xml_3)
             if not module_data["contents"]:
                 self._heater_id = NONE
                 return (
@@ -121,7 +121,7 @@ def _appl_thermostat_info(
         """Helper-function for _appliance_info_finder()."""
         locator = "./logs/point_log[type='thermostat']/thermostat"
         xml_2 = return_valid(xml_2, self._domain_objects)
-        module_data = self._get_module_data(xml_1, locator, xml_2)
+        module_data = self._get_module_data(xml_1, locator, xml_2=xml_2)
         if not module_data["contents"]:
             return Munch()  # no module-data present means the device has been removed
 
@@ -239,6 +239,7 @@ def _get_module_data(
         self,
         xml_1: etree.Element,
         locator: str,
+        key: str | None = None,
         xml_2: etree.Element = None,
         legacy: bool = False,
     ) -> ModuleData:
@@ -256,8 +257,11 @@ def _get_module_data(
             "zigbee_mac_address": None,
         }
 
-        if (appl_search := xml_1.find(locator)) is not None:
+        for appl_search in xml_1.findall(locator):
             link_tag = appl_search.tag
+            if key is not None and key not in link_tag:
+                continue
+
             link_id = appl_search.attrib["id"]
             loc = f".//services/{link_tag}[@id='{link_id}']...."
             # Not possible to walrus for some reason...
@@ -272,4 +276,6 @@ def _get_module_data(
                 module_data["firmware_version"] = module.find("firmware_version").text
                 get_zigbee_data(module, module_data, legacy)
 
+            break
+
         return module_data

plugwise/helper.py

@@ -164,7 +164,8 @@ def _get_p1_smartmeter_info(self) -> None:
         """
         appl = Munch()
         locator = MODULE_LOCATOR
-        module_data = self._get_module_data(self._home_location, locator)
+        tag = "electricity"
+        module_data = self._get_module_data(self._home_location, locator, key=tag)
         # No module-data present means the device has been removed
         if not module_data["contents"]:  # pragma: no cover
             return

plugwise/legacy/helper.py

@@ -212,7 +212,7 @@ def _energy_entity_info_finder(self, appliance: etree, appl: Munch) -> Munch:
         if self.smile.type in ("power", "stretch"):
             locator = "./services/electricity_point_meter"
             module_data = self._get_module_data(
-                appliance, locator, self._modules, legacy=True
+                appliance, locator, xml_2=self._modules, legacy=True
             )
             if not module_data["contents"]:
                 return (