Breakout check_alternative_locations() to util.py

Author: bouwew

plugwise/common.py

@@ -16,6 +16,7 @@
     SensorType,
 )
 from plugwise.util import (
+    check_alternative_locations,
     check_heater_central,
     check_model,
     get_vendor_name,
@@ -131,17 +132,12 @@ def _collect_power_values(self, data: DeviceData, loc: Munch, tariff: str, legac
             key = cast(SensorType, loc.key_string)
             data["sensors"][key] = loc.f_val
 
+
     def _power_data_peak_value(self, loc: Munch, legacy: bool) -> Munch:
         """Helper-function for _power_data_from_location() and _power_data_from_modules()."""
         loc.found = True
-        combination = "log" in loc.log_type and ("gas" in loc.measurement or "phase" in loc.measurement)
-        if legacy:
-             combination = "meter" in loc.log_type and ("point" in loc.log_type or "gas" in loc.measurement)
-
         if loc.logs.find(loc.locator) is None:
-            # If locator not found look for P1 gas_consumed or phase data (without tariff)
-            # For legacy look for P1 legacy electricity_point_meter or gas_*_meter data
-            if combination:
+            if check_alternative_locations(loc, legacy):
                 # Avoid double processing by skipping one peak-list option
                 if loc.peak_select == "nl_offpeak":
                     loc.found = False

plugwise/util.py

@@ -19,6 +19,23 @@
 )
 
 from defusedxml import ElementTree as etree
+from munch import Munch
+
+
+def check_alternative_locations(loc: Munch, legacy: bool) -> bool:
+    """Look for P1 gas_consumed or phase data (without tariff).
+
+    For legacy look for P1 legacy electricity_point_meter or gas_*_meter data.
+    """
+    present = "log" in loc.log_type and (
+        "gas" in loc.measurement or "phase" in loc.measurement
+        )
+    if legacy:
+        present = "meter" in loc.log_type and (
+            "point" in loc.log_type or "gas" in loc.measurement
+            )
+
+    return present
 
 
 def check_heater_central(xml: etree) -> str: