Implement count-suggestion

Author: bouwew

plugwise/helper.py

@@ -601,15 +601,14 @@ 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)
+        # Count only the items in the binary_sensors, sensors and 
+        # switches dicts, and the single data items in data
+        total_bsssw_dict_items = sum(
+            len(data.get(key, {})) for key in ["binary_sensors", "sensors", "switches"]
+        )
+        self._count += total_bsssw_dict_items + len(data) - len(
+            [k for k in data if isinstance(data[k], dict)]
+        )
 
     def _get_toggle_state(
         self, xml: etree, toggle: str, name: ToggleNameType, data: GwEntityData