Explicitly pass in the config_entry in Nextcloud coordinator init (#136774)

This commit is contained in:
Michael 2025-01-29 01:26:20 +01:00 committed by GitHub
parent 3638eb1d34
commit 7256575c09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 11 additions and 10 deletions

View File

@ -9,7 +9,6 @@ from nextcloudmonitor import (
NextcloudMonitorRequestError, NextcloudMonitorRequestError,
) )
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import ( from homeassistant.const import (
CONF_PASSWORD, CONF_PASSWORD,
CONF_URL, CONF_URL,
@ -21,15 +20,13 @@ from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
from homeassistant.helpers import entity_registry as er from homeassistant.helpers import entity_registry as er
from .coordinator import NextcloudDataUpdateCoordinator from .coordinator import NextcloudConfigEntry, NextcloudDataUpdateCoordinator
PLATFORMS = (Platform.SENSOR, Platform.BINARY_SENSOR, Platform.UPDATE) PLATFORMS = (Platform.SENSOR, Platform.BINARY_SENSOR, Platform.UPDATE)
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
type NextcloudConfigEntry = ConfigEntry[NextcloudDataUpdateCoordinator]
async def async_setup_entry(hass: HomeAssistant, entry: NextcloudConfigEntry) -> bool: async def async_setup_entry(hass: HomeAssistant, entry: NextcloudConfigEntry) -> bool:
"""Set up the Nextcloud integration.""" """Set up the Nextcloud integration."""

View File

@ -12,7 +12,7 @@ from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from . import NextcloudConfigEntry from .coordinator import NextcloudConfigEntry
from .entity import NextcloudEntity from .entity import NextcloudEntity
BINARY_SENSORS: Final[list[BinarySensorEntityDescription]] = [ BINARY_SENSORS: Final[list[BinarySensorEntityDescription]] = [

View File

@ -14,12 +14,16 @@ from .const import DEFAULT_SCAN_INTERVAL
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
type NextcloudConfigEntry = ConfigEntry[NextcloudDataUpdateCoordinator]
class NextcloudDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]): class NextcloudDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
"""Nextcloud data update coordinator.""" """Nextcloud data update coordinator."""
config_entry: NextcloudConfigEntry
def __init__( def __init__(
self, hass: HomeAssistant, ncm: NextcloudMonitor, entry: ConfigEntry self, hass: HomeAssistant, ncm: NextcloudMonitor, entry: NextcloudConfigEntry
) -> None: ) -> None:
"""Initialize the Nextcloud coordinator.""" """Initialize the Nextcloud coordinator."""
self.ncm = ncm self.ncm = ncm
@ -28,6 +32,7 @@ class NextcloudDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
super().__init__( super().__init__(
hass, hass,
_LOGGER, _LOGGER,
config_entry=entry,
name=self.url, name=self.url,
update_interval=DEFAULT_SCAN_INTERVAL, update_interval=DEFAULT_SCAN_INTERVAL,
) )

View File

@ -6,9 +6,8 @@ from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.entity import EntityDescription from homeassistant.helpers.entity import EntityDescription
from homeassistant.helpers.update_coordinator import CoordinatorEntity from homeassistant.helpers.update_coordinator import CoordinatorEntity
from . import NextcloudConfigEntry
from .const import DOMAIN from .const import DOMAIN
from .coordinator import NextcloudDataUpdateCoordinator from .coordinator import NextcloudConfigEntry, NextcloudDataUpdateCoordinator
class NextcloudEntity(CoordinatorEntity[NextcloudDataUpdateCoordinator]): class NextcloudEntity(CoordinatorEntity[NextcloudDataUpdateCoordinator]):

View File

@ -23,7 +23,7 @@ from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.util.dt import utc_from_timestamp from homeassistant.util.dt import utc_from_timestamp
from . import NextcloudConfigEntry from .coordinator import NextcloudConfigEntry
from .entity import NextcloudEntity from .entity import NextcloudEntity
UNIT_OF_LOAD: Final[str] = "load" UNIT_OF_LOAD: Final[str] = "load"

View File

@ -6,7 +6,7 @@ from homeassistant.components.update import UpdateEntity, UpdateEntityDescriptio
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from . import NextcloudConfigEntry from .coordinator import NextcloudConfigEntry
from .entity import NextcloudEntity from .entity import NextcloudEntity