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

Don't call off_delay_listener if not needed (#17712)

Browse source 
Don't call off_delay_listener if 'OFF' is actually received
Moved `off_delay_listener` to be defined once
This commit is contained in:
Andrey Kupreychik 2018-10-23 19:21:03 +07:00 • committed by Paulus Schoutsen
parent f6f549dc3c
commit 9798ff019f
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -131,7 +131,14 @@ class MqttBinarySensor(MqttAvailability, MqttDiscoveryUpdate,
await MqttDiscoveryUpdate.async_added_to_hass(self)
@callback
def state_message_received(topic, payload, qos):
def off_delay_listener(now):
"""Switch device off after a delay."""
self._delay_listener = None
self._state = False
self.async_schedule_update_ha_state()
@callback
def state_message_received(_topic, payload, _qos):
"""Handle a new received MQTT state message."""
if self._template is not None:
payload = self._template.async_render_with_possible_json_value(
@ -146,17 +153,10 @@ class MqttBinarySensor(MqttAvailability, MqttDiscoveryUpdate,
self._name, self._state_topic)
return
if (self._state and self._off_delay is not None):
@callback
def off_delay_listener(now):
"""Switch device off after a delay."""
self._delay_listener = None
self._state = False
self.async_schedule_update_ha_state()
if self._delay_listener is not None:
self._delay_listener()
if (self._state and self._off_delay is not None):
self._delay_listener = evt.async_call_later(
self.hass, self._off_delay, off_delay_listener)