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

Cancel august interval track at stop event (#49198)

Browse source
This commit is contained in:
J. Nick Koston 2021-04-24 02:13:25 -10:00 • committed by GitHub
parent bbe58091a8
commit 9a7d500b80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
homeassistant/components/august/activity.py
View file

@ -31,7 +31,6 @@ class ActivityStream(AugustSubscriberMixin):
self._house_ids = house_ids self._house_ids = house_ids
self._latest_activities = {} self._latest_activities = {}
self._last_update_time = None self._last_update_time = None
self._abort_async_track_time_interval = None
self.pubnub = pubnub self.pubnub = pubnub
self._update_debounce = {} self._update_debounce = {}

31
homeassistant/components/august/subscriber.py
View file

@ -1,6 +1,7 @@
"""Base class for August entity.""" """Base class for August entity."""
from homeassistant.const import EVENT_HOMEASSISTANT_STOP
from homeassistant.core import callback from homeassistant.core import callback
from homeassistant.helpers.event import async_track_time_interval from homeassistant.helpers.event import async_track_time_interval
@ -15,6 +16,7 @@ class AugustSubscriberMixin:
self._update_interval = update_interval self._update_interval = update_interval
self._subscriptions = {} self._subscriptions = {}
self._unsub_interval = None self._unsub_interval = None
self._stop_interval = None
@callback @callback
def async_subscribe_device_id(self, device_id, update_callback): def async_subscribe_device_id(self, device_id, update_callback):
@ -23,9 +25,8 @@ class AugustSubscriberMixin:
Returns a callable that can be used to unsubscribe. Returns a callable that can be used to unsubscribe.
""" """
if not self._subscriptions: if not self._subscriptions:
self._unsub_interval = async_track_time_interval( self._async_setup_listeners()
self._hass, self._async_refresh, self._update_interval
)
self._subscriptions.setdefault(device_id, []).append(update_callback) self._subscriptions.setdefault(device_id, []).append(update_callback)
def _unsubscribe(): def _unsubscribe():
@ -33,15 +34,37 @@ class AugustSubscriberMixin:
return _unsubscribe return _unsubscribe
@callback
def _async_setup_listeners(self):
"""Create interval and stop listeners."""
self._unsub_interval = async_track_time_interval(
self._hass, self._async_refresh, self._update_interval
)
@callback
def _async_cancel_update_interval(_):
self._stop_interval = None
self._unsub_interval()
self._stop_interval = self._hass.bus.async_listen(
EVENT_HOMEASSISTANT_STOP, _async_cancel_update_interval
)
@callback @callback
def async_unsubscribe_device_id(self, device_id, update_callback): def async_unsubscribe_device_id(self, device_id, update_callback):
"""Remove a callback subscriber.""" """Remove a callback subscriber."""
self._subscriptions[device_id].remove(update_callback) self._subscriptions[device_id].remove(update_callback)
if not self._subscriptions[device_id]: if not self._subscriptions[device_id]:
del self._subscriptions[device_id] del self._subscriptions[device_id]
if not self._subscriptions:
if self._subscriptions:
return
self._unsub_interval() self._unsub_interval()
self._unsub_interval = None self._unsub_interval = None
if self._stop_interval:
self._stop_interval()
self._stop_interval = None
@callback @callback
def async_signal_device_id_update(self, device_id): def async_signal_device_id_update(self, device_id):