evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct MQTT binary_sensor and sensor state restoring (#66690)

Browse source
This commit is contained in:
Erik Montnemery 2022-02-16 23:07:21 +01:00 • committed by GitHub
parent 2687f61428
commit be0ef5ad6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
homeassistant/components/mqtt/binary_sensor.py
View file

@ -126,6 +126,9 @@ class MqttBinarySensor(MqttEntity, BinarySensorEntity, RestoreEntity):
and expire_after > 0 and expire_after > 0
and (last_state := await self.async_get_last_state()) is not None and (last_state := await self.async_get_last_state()) is not None
and last_state.state not in [STATE_UNKNOWN, STATE_UNAVAILABLE] and last_state.state not in [STATE_UNKNOWN, STATE_UNAVAILABLE]
# We might have set up a trigger already after subscribing from
# super().async_added_to_hass(), then we should not restore state
and not self._expiration_trigger
): ):
expiration_at = last_state.last_changed + timedelta(seconds=expire_after) expiration_at = last_state.last_changed + timedelta(seconds=expire_after)
if expiration_at < (time_now := dt_util.utcnow()): if expiration_at < (time_now := dt_util.utcnow()):
@ -135,10 +138,6 @@ class MqttBinarySensor(MqttEntity, BinarySensorEntity, RestoreEntity):
self._expired = False self._expired = False
self._state = last_state.state == STATE_ON self._state = last_state.state == STATE_ON
if self._expiration_trigger:
# We might have set up a trigger already after subscribing from
# super().async_added_to_hass()
self._expiration_trigger()
self._expiration_trigger = async_track_point_in_utc_time( self._expiration_trigger = async_track_point_in_utc_time(
self.hass, self._value_is_expired, expiration_at self.hass, self._value_is_expired, expiration_at
) )

7
homeassistant/components/mqtt/sensor.py
View file

@ -172,6 +172,9 @@ class MqttSensor(MqttEntity, SensorEntity, RestoreEntity):
and expire_after > 0 and expire_after > 0
and (last_state := await self.async_get_last_state()) is not None and (last_state := await self.async_get_last_state()) is not None
and last_state.state not in [STATE_UNKNOWN, STATE_UNAVAILABLE] and last_state.state not in [STATE_UNKNOWN, STATE_UNAVAILABLE]
# We might have set up a trigger already after subscribing from
# super().async_added_to_hass(), then we should not restore state
and not self._expiration_trigger
): ):
expiration_at = last_state.last_changed + timedelta(seconds=expire_after) expiration_at = last_state.last_changed + timedelta(seconds=expire_after)
if expiration_at < (time_now := dt_util.utcnow()): if expiration_at < (time_now := dt_util.utcnow()):
@ -181,10 +184,6 @@ class MqttSensor(MqttEntity, SensorEntity, RestoreEntity):
self._expired = False self._expired = False
self._state = last_state.state self._state = last_state.state
if self._expiration_trigger:
# We might have set up a trigger already after subscribing from
# super().async_added_to_hass()
self._expiration_trigger()
self._expiration_trigger = async_track_point_in_utc_time( self._expiration_trigger = async_track_point_in_utc_time(
self.hass, self._value_is_expired, expiration_at self.hass, self._value_is_expired, expiration_at
) )