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

Perform some ReCollect Waste code cleanup (#58866)

Browse source
This commit is contained in:
Aaron Bach 2021-11-14 11:12:34 -07:00 • committed by GitHub
parent dbfe0cad52
commit 20fbb5b951
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
homeassistant/components/recollect_waste/__init__.py
View file

@ -11,7 +11,7 @@ from homeassistant.core import HomeAssistant
from homeassistant.helpers import aiohttp_client from homeassistant.helpers import aiohttp_client
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
from .const import CONF_PLACE_ID, CONF_SERVICE_ID, DATA_COORDINATOR, DOMAIN, LOGGER from .const import CONF_PLACE_ID, CONF_SERVICE_ID, DOMAIN, LOGGER
DEFAULT_NAME = "recollect_waste" DEFAULT_NAME = "recollect_waste"
DEFAULT_UPDATE_INTERVAL = timedelta(days=1) DEFAULT_UPDATE_INTERVAL = timedelta(days=1)
@ -21,9 +21,6 @@ PLATFORMS = ["sensor"]
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
"""Set up RainMachine as config entry.""" """Set up RainMachine as config entry."""
hass.data.setdefault(DOMAIN, {})
hass.data[DOMAIN][entry.entry_id] = {}
session = aiohttp_client.async_get_clientsession(hass) session = aiohttp_client.async_get_clientsession(hass)
client = Client( client = Client(
entry.data[CONF_PLACE_ID], entry.data[CONF_SERVICE_ID], session=session entry.data[CONF_PLACE_ID], entry.data[CONF_SERVICE_ID], session=session
@ -49,7 +46,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
) )
await coordinator.async_config_entry_first_refresh() await coordinator.async_config_entry_first_refresh()
hass.data[DOMAIN][entry.entry_id][DATA_COORDINATOR] = coordinator hass.data.setdefault(DOMAIN, {})
hass.data[DOMAIN][entry.entry_id] = coordinator
hass.config_entries.async_setup_platforms(entry, PLATFORMS) hass.config_entries.async_setup_platforms(entry, PLATFORMS)

2
homeassistant/components/recollect_waste/const.py
View file

@ -7,5 +7,3 @@ LOGGER = logging.getLogger(__package__)
CONF_PLACE_ID = "place_id" CONF_PLACE_ID = "place_id"
CONF_SERVICE_ID = "service_id" CONF_SERVICE_ID = "service_id"
DATA_COORDINATOR = "coordinator"

9
homeassistant/components/recollect_waste/sensor.py
View file

@ -5,7 +5,7 @@ from aiorecollect.client import PickupType
from homeassistant.components.sensor import SensorEntity from homeassistant.components.sensor import SensorEntity
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
from homeassistant.const import ATTR_ATTRIBUTION, CONF_FRIENDLY_NAME, DEVICE_CLASS_DATE from homeassistant.const import CONF_FRIENDLY_NAME, DEVICE_CLASS_DATE
from homeassistant.core import HomeAssistant, callback from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers import config_validation as cv from homeassistant.helpers import config_validation as cv
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
@ -14,14 +14,13 @@ from homeassistant.helpers.update_coordinator import (
DataUpdateCoordinator, DataUpdateCoordinator,
) )
from .const import CONF_PLACE_ID, CONF_SERVICE_ID, DATA_COORDINATOR, DOMAIN from .const import CONF_PLACE_ID, CONF_SERVICE_ID, DOMAIN
ATTR_PICKUP_TYPES = "pickup_types" ATTR_PICKUP_TYPES = "pickup_types"
ATTR_AREA_NAME = "area_name" ATTR_AREA_NAME = "area_name"
ATTR_NEXT_PICKUP_TYPES = "next_pickup_types" ATTR_NEXT_PICKUP_TYPES = "next_pickup_types"
ATTR_NEXT_PICKUP_DATE = "next_pickup_date" ATTR_NEXT_PICKUP_DATE = "next_pickup_date"
DEFAULT_ATTRIBUTION = "Pickup data provided by ReCollect Waste"
DEFAULT_NAME = "Waste Pickup" DEFAULT_NAME = "Waste Pickup"
PLATFORM_SCHEMA = cv.deprecated(DOMAIN) PLATFORM_SCHEMA = cv.deprecated(DOMAIN)
@ -44,7 +43,7 @@ async def async_setup_entry(
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
) -> None: ) -> None:
"""Set up ReCollect Waste sensors based on a config entry.""" """Set up ReCollect Waste sensors based on a config entry."""
coordinator = hass.data[DOMAIN][entry.entry_id][DATA_COORDINATOR] coordinator = hass.data[DOMAIN][entry.entry_id]
async_add_entities([ReCollectWasteSensor(coordinator, entry)]) async_add_entities([ReCollectWasteSensor(coordinator, entry)])
@ -57,7 +56,7 @@ class ReCollectWasteSensor(CoordinatorEntity, SensorEntity):
"""Initialize the sensor.""" """Initialize the sensor."""
super().__init__(coordinator) super().__init__(coordinator)
self._attr_extra_state_attributes = {ATTR_ATTRIBUTION: DEFAULT_ATTRIBUTION} self._attr_extra_state_attributes = {}
self._attr_name = DEFAULT_NAME self._attr_name = DEFAULT_NAME
self._attr_unique_id = ( self._attr_unique_id = (
f"{entry.data[CONF_PLACE_ID]}{entry.data[CONF_SERVICE_ID]}" f"{entry.data[CONF_PLACE_ID]}{entry.data[CONF_SERVICE_ID]}"