jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-26 22:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use runtime_data in icloud (#145179)

Browse Source
This commit is contained in:
epenet 2025-05-19 10:59:06 +02:00 committed by GitHub
parent da6c6c5201
commit bd190b9b4c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
homeassistant/components/icloud/__init__.py
View File

@ -4,17 +4,15 @@ from __future__ import annotations
from typing import Any
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
from homeassistant.core import HomeAssistant
from homeassistant.helpers.storage import Store
from .account import IcloudAccount
from .account import IcloudAccount, IcloudConfigEntry
from .const import (
CONF_GPS_ACCURACY_THRESHOLD,
CONF_MAX_INTERVAL,
CONF_WITH_FAMILY,
DOMAIN,
PLATFORMS,
STORAGE_KEY,
STORAGE_VERSION,
@ -22,11 +20,9 @@ from .const import (
from .services import register_services
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
async def async_setup_entry(hass: HomeAssistant, entry: IcloudConfigEntry) -> bool:
"""Set up an iCloud account from a config entry."""
hass.data.setdefault(DOMAIN, {})
username = entry.data[CONF_USERNAME]
password = entry.data[CONF_PASSWORD]
with_family = entry.data[CONF_WITH_FAMILY]
@ -51,7 +47,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
)
await hass.async_add_executor_job(account.setup)
hass.data[DOMAIN][entry.unique_id] = account
entry.runtime_data = account
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
@ -60,9 +56,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
return True
async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
async def async_unload_entry(hass: HomeAssistant, entry: IcloudConfigEntry) -> bool:
"""Unload a config entry."""
unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
if unload_ok:
hass.data[DOMAIN].pop(entry.data[CONF_USERNAME])
return unload_ok
return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

4
homeassistant/components/icloud/account.py
View File

@ -58,6 +58,8 @@ from .const import (
_LOGGER = logging.getLogger(__name__)
type IcloudConfigEntry = ConfigEntry[IcloudAccount]
class IcloudAccount:
"""Representation of an iCloud account."""
@ -71,7 +73,7 @@ class IcloudAccount:
with_family: bool,
max_interval: int,
gps_accuracy_threshold: int,
config_entry: ConfigEntry,
config_entry: IcloudConfigEntry,
) -> None:
"""Initialize an iCloud account."""
self.hass = hass

7
homeassistant/components/icloud/device_tracker.py
View File

@ -5,13 +5,12 @@ from __future__ import annotations
from typing import Any
from homeassistant.components.device_tracker import TrackerEntity
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.dispatcher import async_dispatcher_connect
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .account import IcloudAccount, IcloudDevice
from .account import IcloudAccount, IcloudConfigEntry, IcloudDevice
from .const import (
DEVICE_LOCATION_HORIZONTAL_ACCURACY,
DEVICE_LOCATION_LATITUDE,
@ -22,11 +21,11 @@ from .const import (
async def async_setup_entry(
hass: HomeAssistant,
entry: ConfigEntry,
entry: IcloudConfigEntry,
async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up device tracker for iCloud component."""
account: IcloudAccount = hass.data[DOMAIN][entry.unique_id]
account = entry.runtime_data
tracked = set[str]()
@callback

7
homeassistant/components/icloud/sensor.py
View File

@ -5,7 +5,6 @@ from __future__ import annotations
from typing import Any
from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import PERCENTAGE
from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
from homeassistant.helpers.device_registry import DeviceInfo
@ -13,17 +12,17 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.icon import icon_for_battery_level
from .account import IcloudAccount, IcloudDevice
from .account import IcloudAccount, IcloudConfigEntry, IcloudDevice
from .const import DOMAIN
async def async_setup_entry(
hass: HomeAssistant,
entry: ConfigEntry,
entry: IcloudConfigEntry,
async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up device tracker for iCloud component."""
account: IcloudAccount = hass.data[DOMAIN][entry.unique_id]
account = entry.runtime_data
tracked = set[str]()
@callback