Move count_data_items function to utils

Author: bouwew

plugwise/common.py

@@ -135,19 +135,6 @@ def _collect_power_values(
             key = cast(SensorType, loc.key_string)
             data["sensors"][key] = loc.f_val
 
-    def _count_data_items(self, data: GwEntityData) -> None:
-        """When present, count the binary_sensors, sensors and switches dict-items, don't count the dicts.
-
-        Also, count the remaining single data items, the amount of dicts present have already been pre-subtracted in the previous step.
-        """
-        if "binary_sensors" in data:
-            self._count += len(data["binary_sensors"]) - 1
-        if "sensors" in data:
-            self._count += len(data["sensors"]) - 1
-        if "switches" in data:
-            self._count += len(data["switches"]) - 1
-        self._count += len(data)
-
     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

plugwise/helper.py

@@ -45,6 +45,7 @@
 from plugwise.util import (
     check_model,
     common_match_cases,
+    count_data_items,
     format_measure,
     skip_obsolete_measurements,
 )
@@ -424,7 +425,7 @@ def _appliance_measurements(
                     appl_i_loc.text, ENERGY_WATT_HOUR
                 )
 
-        self._count_data_items(data)
+        self._count = count_data_items(self._count, data)
 
     def _get_toggle_state(
         self, xml: etree, toggle: str, name: ToggleNameType, data: GwEntityData

plugwise/legacy/helper.py

@@ -36,6 +36,7 @@
 )
 from plugwise.util import (
     common_match_cases,
+    count_data_items,
     format_measure,
     skip_obsolete_measurements,
     version_to_model,
@@ -340,7 +341,7 @@ def _appliance_measurements(
                     appl_i_loc.text, ENERGY_WATT_HOUR
                 )
 
-        self._count_data_items(data)
+        self._count = count_data_items(self._count, data)
 
     def _get_actuator_functionalities(
         self, xml: etree, entity: GwEntityData, data: GwEntityData

plugwise/util.py

@@ -145,6 +145,22 @@ def common_match_cases(
         data["binary_sensors"]["low_battery"] = False
 
 
+def count_data_items(count: int, data: GwEntityData) -> int:
+    """When present, count the binary_sensors, sensors and switches dict-items, don't count the dicts.
+
+    Also, count the remaining single data items, the amount of dicts present have already been pre-subtracted in the previous step.
+    """
+    if "binary_sensors" in data:
+        count += len(data["binary_sensors"]) - 1
+    if "sensors" in data:
+        count += len(data["sensors"]) - 1
+    if "switches" in data:
+        count += len(data["switches"]) - 1
+
+    count += len(data)
+    return count
+
+
 def escape_illegal_xml_characters(xmldata: str) -> str:
     """Replace illegal &-characters."""
     return re.sub(r"&([^a-zA-Z#])", r"&\1", xmldata)