Import helpers in Sonos instead of accessing hass (#60848)

This commit is contained in:
jjlawren 2021-12-02 11:21:49 -06:00 committed by GitHub
parent 7d3fcfbd30
commit e56a676fd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions

View File

@ -24,6 +24,7 @@ from homeassistant.const import CONF_HOSTS, EVENT_HOMEASSISTANT_STOP
from homeassistant.core import Event, HomeAssistant, callback from homeassistant.core import Event, HomeAssistant, callback
from homeassistant.helpers import config_validation as cv from homeassistant.helpers import config_validation as cv
from homeassistant.helpers.dispatcher import async_dispatcher_send from homeassistant.helpers.dispatcher import async_dispatcher_send
from homeassistant.helpers.event import async_track_time_interval, call_later
from .alarms import SonosAlarms from .alarms import SonosAlarms
from .const import ( from .const import (
@ -236,8 +237,8 @@ class SonosDiscoveryManager:
if soco and soco.is_visible: if soco and soco.is_visible:
self._discovered_player(soco) self._discovered_player(soco)
self.data.hosts_heartbeat = self.hass.helpers.event.call_later( self.data.hosts_heartbeat = call_later(
DISCOVERY_INTERVAL.total_seconds(), self._manual_hosts self.hass, DISCOVERY_INTERVAL.total_seconds(), self._manual_hosts
) )
def _discovered_ip(self, ip_address): def _discovered_ip(self, ip_address):
@ -331,7 +332,8 @@ class SonosDiscoveryManager:
) )
self.entry.async_on_unload( self.entry.async_on_unload(
self.hass.helpers.event.async_track_time_interval( async_track_time_interval(
self.hass,
partial( partial(
async_dispatcher_send, async_dispatcher_send,
self.hass, self.hass,

View File

@ -33,6 +33,7 @@ from homeassistant.helpers.dispatcher import (
async_dispatcher_send, async_dispatcher_send,
dispatcher_send, dispatcher_send,
) )
from homeassistant.helpers.event import async_track_time_interval, track_time_interval
from homeassistant.util import dt as dt_util from homeassistant.util import dt as dt_util
from .alarms import SonosAlarms from .alarms import SonosAlarms
@ -240,8 +241,8 @@ class SonosSpeaker:
if battery_info := fetch_battery_info_or_none(self.soco): if battery_info := fetch_battery_info_or_none(self.soco):
self.battery_info = battery_info self.battery_info = battery_info
# Battery events can be infrequent, polling is still necessary # Battery events can be infrequent, polling is still necessary
self._battery_poll_timer = self.hass.helpers.event.track_time_interval( self._battery_poll_timer = track_time_interval(
self.async_poll_battery, BATTERY_SCAN_INTERVAL self.hass, self.async_poll_battery, BATTERY_SCAN_INTERVAL
) )
dispatcher_send(self.hass, SONOS_CREATE_BATTERY, self) dispatcher_send(self.hass, SONOS_CREATE_BATTERY, self)
else: else:
@ -337,7 +338,8 @@ class SonosSpeaker:
# Create a polling task in case subscriptions fail or callback events do not arrive # Create a polling task in case subscriptions fail or callback events do not arrive
if not self._poll_timer: if not self._poll_timer:
self._poll_timer = self.hass.helpers.event.async_track_time_interval( self._poll_timer = async_track_time_interval(
self.hass,
partial( partial(
async_dispatcher_send, async_dispatcher_send,
self.hass, self.hass,