fix: simplify operator and fix async_dispatcher is removed

Author: bramstroker

custom_components/powercalc/sensors/group/standby.py

@@ -72,10 +72,12 @@ def __init__(self, hass: HomeAssistant, rounding_digits: int = 2) -> None:
     async def async_added_to_hass(self) -> None:
         """Register state listeners."""
         await super().async_added_to_hass()
-        async_dispatcher_connect(
-            self.hass,
-            SIGNAL_POWER_SENSOR_STATE_CHANGE,
-            self._recalculate,
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                SIGNAL_POWER_SENSOR_STATE_CHANGE,
+                self._recalculate,
+            ),
         )
 
     async def _recalculate(self) -> None:

custom_components/powercalc/strategy/composite.py

@@ -159,9 +159,7 @@ async def calculate(self, entity_state: State) -> Decimal | None:
             if isinstance(strategy, PlaybookStrategy):
                 await self.activate_playbook(strategy)
 
-            if (
-                entity_state.state == STATE_OFF and strategy.can_calculate_standby()
-            ) or entity_state.state != STATE_OFF:
+            if entity_state.state != STATE_OFF or strategy.can_calculate_standby():
                 value = await strategy.calculate(entity_state)
                 if value is not None:
                     if self.mode == CompositeMode.STOP_AT_FIRST: