Break out _count_data_items() function and implement

Author: bouwew

plugwise/common.py

@@ -131,6 +131,19 @@ def _collect_power_values(self, data: GwEntityData, loc: Munch, tariff: str, leg
             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

@@ -601,15 +601,7 @@ def _appliance_measurements(
                     appl_i_loc.text, ENERGY_WATT_HOUR
                 )
 
-        # Don't count the below top-level dicts when present
-        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
-        # Count the remaining single data items, with the sub-dicts present already subtracted
-        self._count += len(data)
+        self._count_data_items(data)
 
     def _get_toggle_state(
         self, xml: etree, toggle: str, name: ToggleNameType, data: GwEntityData

plugwise/legacy/helper.py

@@ -360,11 +360,7 @@ def _appliance_measurements(
                     appl_i_loc.text, ENERGY_WATT_HOUR
                 )
 
-        self._count += len(data["binary_sensors"])
-        self._count += len(data["sensors"])
-        self._count += len(data["switches"])
-        # Don't count the above top-level dicts, only the remaining single items
-        self._count += len(data) - 3
+        self._count_data_items(data)
 
     def _get_actuator_functionalities(
         self,