Remove boolean-output from format_measure()

Author: bouwew

plugwise/helper.py

@@ -861,10 +861,9 @@ def _appliance_measurements(
                         data["select_dhw_mode"] = appl_p_loc.text
                     case _ as meas_rn if meas_rn in BINARY_SENSORS:
                         bs_key = cast(BinarySensorType, meas_rn)
-                        bs_value = format_measure(
-                            appl_p_loc.text, getattr(attrs, ATTR_UNIT_OF_MEASUREMENT)
+                        bs_value = appl_p_loc.text in ["on", "true"]
                         )
-                        assert isinstance(bs_value, bool)
+                        # assert isinstance(bs_value, bool)
                         data["binary_sensors"][bs_key] = bs_value
                     case _ as meas_rn if meas_rn in SENSORS:
                         s_key = cast(SensorType, meas_rn)
@@ -888,16 +887,11 @@ def _appliance_measurements(
                             ]
                     case _ as meas_rn if meas_rn in SWITCHES:
                         sw_key = cast(SwitchType, meas_rn)
-                        value = format_measure(
-                            appl_p_loc.text, getattr(attrs, ATTR_UNIT_OF_MEASUREMENT)
-                        )
-                        sw_value = cast(bool, value)
+                        sw_value = appl_p_loc.text in ["on", "true"]
                         data["switches"][sw_key] = sw_value
                     case "c_heating_state":
-                        value = format_measure(
-                            appl_p_loc.text, getattr(attrs, ATTR_UNIT_OF_MEASUREMENT)
-                        )
-                        assert isinstance(value, bool)
+                        value = appl_p_loc.text in ["on", "true"]
+                        # assert isinstance(value, bool)
                         data["c_heating_state"] = value
                     case "elga_status_code":
                         data["elga_status_code"] = int(appl_p_loc.text)

plugwise/util.py

@@ -20,36 +20,33 @@ def escape_illegal_xml_characters(xmldata: str) -> str:
     return re.sub(r"&([^a-zA-Z#])", r"&\1", xmldata)
 
 
-def format_measure(measure: str, unit: str) -> bool | float | int:
+def format_measure(measure: str, unit: str) -> float | int:
     """Format measure to correct type."""
-    result: bool | float | int = False
+    result: float | int = 0
     try:
         result = int(measure)
         if unit == TEMP_CELSIUS:
             result = float(measure)
     except ValueError:
-        try:
-            float_measure = float(measure)
-            if unit == PERCENTAGE:
-                if 0 < float_measure <= 1:
-                    return int(float_measure * 100)
-
-            if unit == ENERGY_KILO_WATT_HOUR:
-                float_measure = float_measure / 1000
-
-            if unit in SPECIAL_FORMAT:
-                result = float(f"{round(float_measure, 3):.3f}")
-            elif unit == ELECTRIC_POTENTIAL_VOLT:
+        float_measure = float(measure)
+        if unit == PERCENTAGE:
+            if 0 < float_measure <= 1:
+                return int(float_measure * 100)
+
+        if unit == ENERGY_KILO_WATT_HOUR:
+            float_measure = float_measure / 1000
+
+        if unit in SPECIAL_FORMAT:
+            result = float(f"{round(float_measure, 3):.3f}")
+        elif unit == ELECTRIC_POTENTIAL_VOLT:
+            result = float(f"{round(float_measure, 1):.1f}")
+        else:
+            if abs(float_measure) < 10:
+                result = float(f"{round(float_measure, 2):.2f}")
+            elif abs(float_measure) >= 10 and abs(float_measure) < 100:
                 result = float(f"{round(float_measure, 1):.1f}")
-            else:
-                if abs(float_measure) < 10:
-                    result = float(f"{round(float_measure, 2):.2f}")
-                elif abs(float_measure) >= 10 and abs(float_measure) < 100:
-                    result = float(f"{round(float_measure, 1):.1f}")
-                elif abs(float_measure) >= 100:
-                    result = int(round(float_measure))
-        except ValueError:
-            result = measure in ["on", "true"]
+            elif abs(float_measure) >= 100:
+                result = int(round(float_measure))
 
     return result