jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-04-26 18:27:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move wireless clients into entity_loader (#112813)

Browse Source
This commit is contained in:
Robert Svensson 2024-03-09 11:30:01 +01:00 committed by GitHub
parent b26f00bf39
commit a2180b16c3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
homeassistant/components/unifi/device_tracker.py
View File

@ -89,7 +89,7 @@ def async_client_allowed_fn(hub: UnifiHub, obj_id: str) -> bool:
return False return False
client = hub.api.clients[obj_id] client = hub.api.clients[obj_id]
if client.mac not in hub.wireless_clients: if client.mac not in hub.entity_loader.wireless_clients:
if not hub.config.option_track_wired_clients: if not hub.config.option_track_wired_clients:
return False return False
@ -108,7 +108,7 @@ def async_client_is_connected_fn(hub: UnifiHub, obj_id: str) -> bool:
"""Check if device object is disabled.""" """Check if device object is disabled."""
client = hub.api.clients[obj_id] client = hub.api.clients[obj_id]
if hub.wireless_clients.is_wireless(client) and client.is_wired: if hub.entity_loader.wireless_clients.is_wireless(client) and client.is_wired:
if not hub.config.option_ignore_wired_bug: if not hub.config.option_ignore_wired_bug:
return False # Wired bug in action return False # Wired bug in action

4
homeassistant/components/unifi/hub/entity_loader.py
View File

@ -20,7 +20,7 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.entity_registry import async_entries_for_config_entry from homeassistant.helpers.entity_registry import async_entries_for_config_entry
from ..const import LOGGER from ..const import LOGGER, UNIFI_WIRELESS_CLIENTS
from ..entity import UnifiEntity, UnifiEntityDescription from ..entity import UnifiEntity, UnifiEntityDescription
if TYPE_CHECKING: if TYPE_CHECKING:
@ -46,6 +46,7 @@ class UnifiEntityLoader:
hub.api.system_information.update, hub.api.system_information.update,
hub.api.wlans.update, hub.api.wlans.update,
) )
self.wireless_clients = hub.hass.data[UNIFI_WIRELESS_CLIENTS]
self.platforms: list[ self.platforms: list[
tuple[ tuple[
@ -63,6 +64,7 @@ class UnifiEntityLoader:
"""Initialize API data and extra client support.""" """Initialize API data and extra client support."""
await self.refresh_api_data() await self.refresh_api_data()
self.restore_inactive_clients() self.restore_inactive_clients()
self.wireless_clients.update_clients(set(self.hub.api.clients.values()))
async def refresh_api_data(self) -> None: async def refresh_api_data(self) -> None:
"""Refresh API data from network application.""" """Refresh API data from network application."""

12
homeassistant/components/unifi/hub/hub.py
View File

@ -19,13 +19,7 @@ from homeassistant.helpers.dispatcher import async_dispatcher_send
from homeassistant.helpers.event import async_call_later, async_track_time_interval from homeassistant.helpers.event import async_call_later, async_track_time_interval
import homeassistant.util.dt as dt_util import homeassistant.util.dt as dt_util
from ..const import ( from ..const import ATTR_MANUFACTURER, CONF_SITE_ID, DOMAIN as UNIFI_DOMAIN, PLATFORMS
ATTR_MANUFACTURER,
CONF_SITE_ID,
DOMAIN as UNIFI_DOMAIN,
PLATFORMS,
UNIFI_WIRELESS_CLIENTS,
)
from .config import UnifiConfig from .config import UnifiConfig
from .entity_loader import UnifiEntityLoader from .entity_loader import UnifiEntityLoader
from .websocket import UnifiWebsocket from .websocket import UnifiWebsocket
@ -46,8 +40,6 @@ class UnifiHub:
self.entity_loader = UnifiEntityLoader(self) self.entity_loader = UnifiEntityLoader(self)
self.websocket = UnifiWebsocket(hass, api, self.signal_reachable) self.websocket = UnifiWebsocket(hass, api, self.signal_reachable)
self.wireless_clients = hass.data[UNIFI_WIRELESS_CLIENTS]
self.site = config_entry.data[CONF_SITE_ID] self.site = config_entry.data[CONF_SITE_ID]
self.is_admin = False self.is_admin = False
@ -91,8 +83,6 @@ class UnifiHub:
assert self.config.entry.unique_id is not None assert self.config.entry.unique_id is not None
self.is_admin = self.api.sites[self.config.entry.unique_id].role == "admin" self.is_admin = self.api.sites[self.config.entry.unique_id].role == "admin"
self.wireless_clients.update_clients(set(self.api.clients.values()))
self.config.entry.add_update_listener(self.async_config_entry_updated) self.config.entry.add_update_listener(self.async_config_entry_updated)
self._cancel_heartbeat_check = async_track_time_interval( self._cancel_heartbeat_check = async_track_time_interval(

4
homeassistant/components/unifi/sensor.py
View File

@ -72,7 +72,7 @@ def async_uptime_sensor_allowed_fn(hub: UnifiHub, obj_id: str) -> bool:
@callback @callback
def async_client_rx_value_fn(hub: UnifiHub, client: Client) -> float: def async_client_rx_value_fn(hub: UnifiHub, client: Client) -> float:
"""Calculate receiving data transfer value.""" """Calculate receiving data transfer value."""
if hub.wireless_clients.is_wireless(client): if hub.entity_loader.wireless_clients.is_wireless(client):
return client.rx_bytes_r / 1000000 return client.rx_bytes_r / 1000000
return client.wired_rx_bytes_r / 1000000 return client.wired_rx_bytes_r / 1000000
@ -80,7 +80,7 @@ def async_client_rx_value_fn(hub: UnifiHub, client: Client) -> float:
@callback @callback
def async_client_tx_value_fn(hub: UnifiHub, client: Client) -> float: def async_client_tx_value_fn(hub: UnifiHub, client: Client) -> float:
"""Calculate transmission data transfer value.""" """Calculate transmission data transfer value."""
if hub.wireless_clients.is_wireless(client): if hub.entity_loader.wireless_clients.is_wireless(client):
return client.tx_bytes_r / 1000000 return client.tx_bytes_r / 1000000
return client.wired_tx_bytes_r / 1000000 return client.wired_tx_bytes_r / 1000000