Create dummy-netstrings for all interval-sensors

Also, pop the dummy-result, optimize code

Author: bouwew

plugwise/helper.py

@@ -201,18 +201,17 @@ def power_data_local_format(attrs, key_string, val):
 
 def power_data_energy_diff(measurement, net_string, f_val, direct_data):
     """Calculate differential energy."""
-    if "electricity" in measurement:
-        diff = 1
-        if "produced" in measurement:
-            diff = -1
-        if net_string not in direct_data:
-            direct_data[net_string] = 0
-
-        if isinstance(f_val, int):
-            direct_data[net_string] += f_val * diff
-        else:
-            direct_data[net_string] += float(f_val * diff)
-            direct_data[net_string] = float(f"{round(direct_data[net_string], 3):.3f}")
+    diff = 1
+    if "produced" in measurement:
+        diff = -1
+    if net_string not in direct_data:
+        direct_data[net_string] = 0
+
+    if isinstance(f_val, int):
+        direct_data[net_string] += f_val * diff
+    else:
+        direct_data[net_string] += float(f_val * diff)
+        direct_data[net_string] = float(f"{round(direct_data[net_string], 3):.3f}")
 
     return direct_data
 
@@ -926,7 +925,7 @@ def _heating_valves(self):
     def _power_data_peak_value(self, loc):
         """Helper-function for _power_data_from_location()."""
         loc.found = True
-        loc.net_string = None
+        loc.net_string = "dummy"
 
         # Only once try to find P1 Legacy values
         if loc.logs.find(loc.locator) is None and self.smile_type == "power":
@@ -951,7 +950,7 @@ def _power_data_peak_value(self, loc):
         loc.key_string = f"{loc.measurement}_{peak}_{log_found}"
         if "gas" in loc.measurement:
             loc.key_string = f"{loc.measurement}_{log_found}"
-        # Don't create net_elec_interval sensor!
+        # Don't create net_elec_interval sensor
         if "electricity" in loc.measurement and "interval" not in log_found:
             loc.net_string = f"net_electricity_{log_found}"
         val = loc.logs.find(loc.locator).text
@@ -1006,6 +1005,7 @@ def _power_data_from_location(self, loc_id):
                         direct_data[loc.key_string] = [loc.f_val, loc.log_date]
 
         if direct_data != {}:
+            direct_data.pop("dummy")
             return direct_data
 
     def _preset(self, loc_id):