From 26e1285f345a65b4c0a3091a8d752559d4a97839 Mon Sep 17 00:00:00 2001 From: mkmer Date: Sat, 4 Nov 2023 11:21:10 -0400 Subject: [PATCH] Address late review for blink (#103376) * use self.coordinator * Dont store coordinator * revert unintended sensor change * revert remove * indention error * revert * Revert more --- homeassistant/components/blink/alarm_control_panel.py | 7 +++---- homeassistant/components/blink/binary_sensor.py | 1 + homeassistant/components/blink/camera.py | 8 ++++---- homeassistant/components/blink/sensor.py | 1 + 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/homeassistant/components/blink/alarm_control_panel.py b/homeassistant/components/blink/alarm_control_panel.py index d1fcb889fb8..c19b07c5874 100644 --- a/homeassistant/components/blink/alarm_control_panel.py +++ b/homeassistant/components/blink/alarm_control_panel.py @@ -57,8 +57,7 @@ class BlinkSyncModuleHA( ) -> None: """Initialize the alarm control panel.""" super().__init__(coordinator) - self.api: Blink = coordinator.api - self._coordinator = coordinator + self.api: Blink = self.coordinator.api self.sync = sync self._attr_unique_id: str = sync.serial self._attr_device_info = DeviceInfo( @@ -94,7 +93,7 @@ class BlinkSyncModuleHA( except asyncio.TimeoutError as er: raise HomeAssistantError("Blink failed to disarm camera") from er - await self._coordinator.async_refresh() + await self.coordinator.async_refresh() async def async_alarm_arm_away(self, code: str | None = None) -> None: """Send arm command.""" @@ -104,5 +103,5 @@ class BlinkSyncModuleHA( except asyncio.TimeoutError as er: raise HomeAssistantError("Blink failed to arm camera away") from er - await self._coordinator.async_refresh() + await self.coordinator.async_refresh() self.async_write_ha_state() diff --git a/homeassistant/components/blink/binary_sensor.py b/homeassistant/components/blink/binary_sensor.py index 47b45e2f4ec..9400e79838b 100644 --- a/homeassistant/components/blink/binary_sensor.py +++ b/homeassistant/components/blink/binary_sensor.py @@ -47,6 +47,7 @@ async def async_setup_entry( hass: HomeAssistant, config: ConfigEntry, async_add_entities: AddEntitiesCallback ) -> None: """Set up the blink binary sensors.""" + coordinator: BlinkUpdateCoordinator = hass.data[DOMAIN][config.entry_id] entities = [ diff --git a/homeassistant/components/blink/camera.py b/homeassistant/components/blink/camera.py index c967ff59c8c..f507364f17f 100644 --- a/homeassistant/components/blink/camera.py +++ b/homeassistant/components/blink/camera.py @@ -32,6 +32,7 @@ async def async_setup_entry( hass: HomeAssistant, config: ConfigEntry, async_add_entities: AddEntitiesCallback ) -> None: """Set up a Blink Camera.""" + coordinator: BlinkUpdateCoordinator = hass.data[DOMAIN][config.entry_id] entities = [ BlinkCamera(coordinator, name, camera) @@ -54,7 +55,6 @@ class BlinkCamera(CoordinatorEntity[BlinkUpdateCoordinator], Camera): """Initialize a camera.""" super().__init__(coordinator) Camera.__init__(self) - self._coordinator = coordinator self._camera = camera self._attr_unique_id = f"{camera.serial}-camera" self._attr_device_info = DeviceInfo( @@ -80,7 +80,7 @@ class BlinkCamera(CoordinatorEntity[BlinkUpdateCoordinator], Camera): raise HomeAssistantError("Blink failed to arm camera") from er self._camera.motion_enabled = True - await self._coordinator.async_refresh() + await self.coordinator.async_refresh() async def async_disable_motion_detection(self) -> None: """Disable motion detection for the camera.""" @@ -90,7 +90,7 @@ class BlinkCamera(CoordinatorEntity[BlinkUpdateCoordinator], Camera): raise HomeAssistantError("Blink failed to disarm camera") from er self._camera.motion_enabled = False - await self._coordinator.async_refresh() + await self.coordinator.async_refresh() @property def motion_detection_enabled(self) -> bool: @@ -106,7 +106,7 @@ class BlinkCamera(CoordinatorEntity[BlinkUpdateCoordinator], Camera): """Trigger camera to take a snapshot.""" with contextlib.suppress(asyncio.TimeoutError): await self._camera.snap_picture() - await self._coordinator.api.refresh() + await self.coordinator.api.refresh() self.async_write_ha_state() def camera_image( diff --git a/homeassistant/components/blink/sensor.py b/homeassistant/components/blink/sensor.py index 064ad9d04f2..74db76c421e 100644 --- a/homeassistant/components/blink/sensor.py +++ b/homeassistant/components/blink/sensor.py @@ -48,6 +48,7 @@ async def async_setup_entry( hass: HomeAssistant, config: ConfigEntry, async_add_entities: AddEntitiesCallback ) -> None: """Initialize a Blink sensor.""" + coordinator: BlinkUpdateCoordinator = hass.data[DOMAIN][config.entry_id] entities = [ BlinkSensor(coordinator, camera, description)