Partly revert to handle both actual and legacy

Author: bouwew

plugwise/common.py

@@ -8,7 +8,6 @@
 
 from plugwise.constants import (
     ANNA,
-    LOGGER,
     SPECIAL_PLUG_TYPES,
     SWITCH_GROUP_TYPES,
     ApplianceType,
@@ -74,13 +73,12 @@ def _appl_heater_central_info(
         appl.name = "OpenTherm"
         locator_1 = "./logs/point_log[type='flame_state']/boiler_state"
         locator_2 = "./services/boiler_state"
-        mod_type = "boiler_state"
         # 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, xml_3)
-        #if not module_data["contents"]:
-        #    module_data = self._get_module_data(xml_1, xml_3)
+        module_data = self._get_module_data(xml_1, locator_1, xml_3)
+        if not module_data["contents"]:
+            module_data = self._get_module_data(xml_1, locator_2, xml_3)
         appl.vendor_name = module_data["vendor_name"]
         appl.hardware = module_data["hardware_version"]
         appl.model_id = module_data["vendor_model"] if not legacy else None
@@ -95,9 +93,8 @@ def _appl_heater_central_info(
     def _appl_thermostat_info(self, appl: Munch, xml_1: etree, xml_2: etree = None) -> Munch:
         """Helper-function for _appliance_info_finder()."""
         locator = "./logs/point_log[type='thermostat']/thermostat"
-        mod_type = "thermostat"
         xml_2 = return_valid(xml_2, self._domain_objects)
-        module_data = self._get_module_data(xml_1, xml_2)
+        module_data = self._get_module_data(xml_1, locator, xml_2)
         appl.vendor_name = module_data["vendor_name"]
         appl.model = module_data["vendor_model"]
         if appl.model != "ThermoTouch":  # model_id for Anna not present as stand-alone device
@@ -278,6 +275,7 @@ def _get_lock_state(self, xml: etree, data: DeviceData, stretch_v2: bool = False
     def _get_module_data(
         self,
         xml_1: etree,
+        locator: str,
         xml_2: etree = None,
         legacy: bool = False,
     ) -> ModelData:
@@ -294,12 +292,11 @@ def _get_module_data(
             "vendor_model": None,
             "zigbee_mac_address": None,
         }
-        if (appl_search := xml_1.find("./logs/point_log/*[@id]")) is not None:
+
+        if (appl_search := xml_1.find(locator)) is not None:
             link_tag = appl_search.tag
             link_id = appl_search.attrib["id"]
             loc = f".//services/{link_tag}[@id='{link_id}']...."
-            if legacy:
-                loc = f".//{link_tag}[@id='{link_id}']...."
             # Not possible to walrus for some reason...
             # xml_2: self._modules for legacy, self._domain_objects for actual
             search = return_valid(xml_2, self._domain_objects)

plugwise/helper.py

@@ -356,7 +356,8 @@ def _p1_smartmeter_info_finder(self, appl: Munch) -> None:
         """Collect P1 DSMR SmartMeter info."""
         loc_id = next(iter(self.loc_data.keys()))
         location = self._domain_objects.find(f'./location[@id="{loc_id}"]')
-        module_data = self._get_module_data(location)
+        locator = "./logs/point_log/*[@id]"
+        module_data = self._get_module_data(location, locator)
         if not module_data["contents"]:
             LOGGER.error("No module data found for SmartMeter")  # pragma: no cover
             return None  # pragma: no cover
@@ -394,7 +395,8 @@ def _appliance_info_finder(self, appl: Munch, appliance: etree) -> Munch:
                 return appl
             case _ as s if s.endswith("_plug"):
                 # Collect info from plug-types (Plug, Aqara Smart Plug)
-                module_data = self._get_module_data(appliance)
+                locator = "./logs/point_log/*[@id]"
+                module_data = self._get_module_data(appliance, locator)
                 # A plug without module-data is orphaned/ no present
                 if not module_data["contents"]:
                     return Munch()
@@ -712,14 +714,11 @@ def _wireless_availability(self, appliance: etree, data: DeviceData) -> None:
         Collect the availability-status for wireless connected devices.
         """
         if self.smile(ADAM):
-            # Try collecting for a Plug
-            module_data = self._get_module_data(appliance)
+            locator = "./logs/point_log/*[@id]"
+            module_data = self._get_module_data(appliance, locator)
             if not module_data["contents"]:
-                # Try collecting for a wireless thermostat
-                module_data = self._get_module_data(appliance)
-                if not module_data["contents"]:
-                    LOGGER.error("No module data found for Plug or wireless thermostat")  # pragma: no cover
-                    return None  # pragma: no cover
+                LOGGER.error("No module data found for Plug or wireless thermostat")  # pragma: no cover
+                return None  # pragma: no cover
 
             if module_data["reachable"] is not None:
                 data["available"] = module_data["reachable"]

plugwise/legacy/helper.py

@@ -230,9 +230,7 @@ def _energy_device_info_finder(self, appliance: etree, appl: Munch) -> Munch:
         """
         if self.smile_type in ("power", "stretch"):
             locator = "./services/electricity_point_meter"
-            mod_type = "electricity_point_meter"
-
-            module_data = self._get_module_data(appliance, self._modules, legacy=True)
+            module_data = self._get_module_data(appliance, locator, self._modules, legacy=True)
             appl.zigbee_mac = module_data["zigbee_mac_address"]
             # Filter appliance without zigbee_mac, it's an orphaned device
             if appl.zigbee_mac is None and self.smile_type != "power":