From 9e3706e3b9746bedcf27b8b37cf68fdd98a84e9a Mon Sep 17 00:00:00 2001 From: Joost Lekkerkerker Date: Mon, 26 Jun 2023 18:24:14 +0200 Subject: [PATCH] Move Aurora entity to separate file (#95245) --- .coveragerc | 1 + homeassistant/components/aurora/__init__.py | 37 -------------- .../components/aurora/binary_sensor.py | 2 +- homeassistant/components/aurora/entity.py | 48 +++++++++++++++++++ homeassistant/components/aurora/sensor.py | 2 +- 5 files changed, 51 insertions(+), 39 deletions(-) create mode 100644 homeassistant/components/aurora/entity.py diff --git a/.coveragerc b/.coveragerc index 44e77956aef..1dc9dd79904 100644 --- a/.coveragerc +++ b/.coveragerc @@ -91,6 +91,7 @@ omit = homeassistant/components/aurora/__init__.py homeassistant/components/aurora/binary_sensor.py homeassistant/components/aurora/coordinator.py + homeassistant/components/aurora/entity.py homeassistant/components/aurora/sensor.py homeassistant/components/avea/light.py homeassistant/components/avion/light.py diff --git a/homeassistant/components/aurora/__init__.py b/homeassistant/components/aurora/__init__.py index 50aff860e9f..db054910d9a 100644 --- a/homeassistant/components/aurora/__init__.py +++ b/homeassistant/components/aurora/__init__.py @@ -8,14 +8,8 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME, Platform from homeassistant.core import HomeAssistant from homeassistant.helpers import aiohttp_client -from homeassistant.helpers.device_registry import DeviceEntryType -from homeassistant.helpers.entity import DeviceInfo -from homeassistant.helpers.update_coordinator import ( - CoordinatorEntity, -) from .const import ( - ATTRIBUTION, AURORA_API, CONF_THRESHOLD, COORDINATOR, @@ -76,34 +70,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: hass.data[DOMAIN].pop(entry.entry_id) return unload_ok - - -class AuroraEntity(CoordinatorEntity[AuroraDataUpdateCoordinator]): - """Implementation of the base Aurora Entity.""" - - _attr_attribution = ATTRIBUTION - - def __init__( - self, - coordinator: AuroraDataUpdateCoordinator, - name: str, - icon: str, - ) -> None: - """Initialize the Aurora Entity.""" - - super().__init__(coordinator=coordinator) - - self._attr_name = name - self._attr_unique_id = f"{coordinator.latitude}_{coordinator.longitude}" - self._attr_icon = icon - - @property - def device_info(self) -> DeviceInfo: - """Define the device based on name.""" - return DeviceInfo( - entry_type=DeviceEntryType.SERVICE, - identifiers={(DOMAIN, str(self.unique_id))}, - manufacturer="NOAA", - model="Aurora Visibility Sensor", - name=self.coordinator.name, - ) diff --git a/homeassistant/components/aurora/binary_sensor.py b/homeassistant/components/aurora/binary_sensor.py index ee2fc53691e..a0e09685a0f 100644 --- a/homeassistant/components/aurora/binary_sensor.py +++ b/homeassistant/components/aurora/binary_sensor.py @@ -4,8 +4,8 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback -from . import AuroraEntity from .const import COORDINATOR, DOMAIN +from .entity import AuroraEntity async def async_setup_entry( diff --git a/homeassistant/components/aurora/entity.py b/homeassistant/components/aurora/entity.py new file mode 100644 index 00000000000..8948ff9c43c --- /dev/null +++ b/homeassistant/components/aurora/entity.py @@ -0,0 +1,48 @@ +"""The aurora component.""" + +import logging + +from homeassistant.helpers.device_registry import DeviceEntryType +from homeassistant.helpers.entity import DeviceInfo +from homeassistant.helpers.update_coordinator import ( + CoordinatorEntity, +) + +from .const import ( + ATTRIBUTION, + DOMAIN, +) +from .coordinator import AuroraDataUpdateCoordinator + +_LOGGER = logging.getLogger(__name__) + + +class AuroraEntity(CoordinatorEntity[AuroraDataUpdateCoordinator]): + """Implementation of the base Aurora Entity.""" + + _attr_attribution = ATTRIBUTION + + def __init__( + self, + coordinator: AuroraDataUpdateCoordinator, + name: str, + icon: str, + ) -> None: + """Initialize the Aurora Entity.""" + + super().__init__(coordinator=coordinator) + + self._attr_name = name + self._attr_unique_id = f"{coordinator.latitude}_{coordinator.longitude}" + self._attr_icon = icon + + @property + def device_info(self) -> DeviceInfo: + """Define the device based on name.""" + return DeviceInfo( + entry_type=DeviceEntryType.SERVICE, + identifiers={(DOMAIN, str(self.unique_id))}, + manufacturer="NOAA", + model="Aurora Visibility Sensor", + name=self.coordinator.name, + ) diff --git a/homeassistant/components/aurora/sensor.py b/homeassistant/components/aurora/sensor.py index de5e566e268..a5436e1e219 100644 --- a/homeassistant/components/aurora/sensor.py +++ b/homeassistant/components/aurora/sensor.py @@ -5,8 +5,8 @@ from homeassistant.const import PERCENTAGE from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback -from . import AuroraEntity from .const import COORDINATOR, DOMAIN +from .entity import AuroraEntity async def async_setup_entry(