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

Revert fritz pref_disable_new_entities handling (#56891)

Browse source
This commit is contained in:
Simone Chemelli 2021-10-01 16:18:49 +02:00 • committed by GitHub
parent 0916322a43
commit 735c9f8f0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
homeassistant/components/fritz/common.py
View file

@ -54,7 +54,6 @@ def _is_tracked(mac: str, current_devices: ValuesView) -> bool:
def device_filter_out_from_trackers( def device_filter_out_from_trackers(
mac: str, mac: str,
device: FritzDevice, device: FritzDevice,
pref_disable_new_entities: bool,
current_devices: ValuesView, current_devices: ValuesView,
) -> bool: ) -> bool:
"""Check if device should be filtered out from trackers.""" """Check if device should be filtered out from trackers."""
@ -63,8 +62,6 @@ def device_filter_out_from_trackers(
reason = "Missing IP" reason = "Missing IP"
elif _is_tracked(mac, current_devices): elif _is_tracked(mac, current_devices):
reason = "Already tracked" reason = "Already tracked"
elif pref_disable_new_entities:
reason = "Disabled System Options"
if reason: if reason:
_LOGGER.debug( _LOGGER.debug(

9
homeassistant/components/fritz/device_tracker.py
View file

@ -80,9 +80,7 @@ async def async_setup_entry(
@callback @callback
def update_router() -> None: def update_router() -> None:
"""Update the values of the router.""" """Update the values of the router."""
_async_add_entities( _async_add_entities(router, async_add_entities, data_fritz)
router, async_add_entities, data_fritz, entry.pref_disable_new_entities
)
entry.async_on_unload( entry.async_on_unload(
async_dispatcher_connect(hass, router.signal_device_new, update_router) async_dispatcher_connect(hass, router.signal_device_new, update_router)
@ -96,7 +94,6 @@ def _async_add_entities(
router: FritzBoxTools, router: FritzBoxTools,
async_add_entities: AddEntitiesCallback, async_add_entities: AddEntitiesCallback,
data_fritz: FritzData, data_fritz: FritzData,
pref_disable_new_entities: bool,
) -> None: ) -> None:
"""Add new tracker entities from the router.""" """Add new tracker entities from the router."""
@ -105,9 +102,7 @@ def _async_add_entities(
data_fritz.tracked[router.unique_id] = set() data_fritz.tracked[router.unique_id] = set()
for mac, device in router.devices.items(): for mac, device in router.devices.items():
if device_filter_out_from_trackers( if device_filter_out_from_trackers(mac, device, data_fritz.tracked.values()):
mac, device, pref_disable_new_entities, data_fritz.tracked.values()
):
continue continue
new_tracked.append(FritzBoxTracker(router, device)) new_tracked.append(FritzBoxTracker(router, device))

13
homeassistant/components/fritz/switch.py
View file

@ -277,7 +277,6 @@ def wifi_entities_list(
def profile_entities_list( def profile_entities_list(
router: FritzBoxTools, router: FritzBoxTools,
data_fritz: FritzData, data_fritz: FritzData,
pref_disable_new_entities: bool,
) -> list[FritzBoxProfileSwitch]: ) -> list[FritzBoxProfileSwitch]:
"""Add new tracker entities from the router.""" """Add new tracker entities from the router."""
@ -291,7 +290,7 @@ def profile_entities_list(
for mac, device in router.devices.items(): for mac, device in router.devices.items():
if device_filter_out_from_trackers( if device_filter_out_from_trackers(
mac, device, pref_disable_new_entities, data_fritz.profile_switches.values() mac, device, data_fritz.profile_switches.values()
): ):
continue continue
@ -306,14 +305,13 @@ def all_entities_list(
device_friendly_name: str, device_friendly_name: str,
data_fritz: FritzData, data_fritz: FritzData,
local_ip: str, local_ip: str,
pref_disable_new_entities: bool,
) -> list[Entity]: ) -> list[Entity]:
"""Get a list of all entities.""" """Get a list of all entities."""
return [ return [
*deflection_entities_list(fritzbox_tools, device_friendly_name), *deflection_entities_list(fritzbox_tools, device_friendly_name),
*port_entities_list(fritzbox_tools, device_friendly_name, local_ip), *port_entities_list(fritzbox_tools, device_friendly_name, local_ip),
*wifi_entities_list(fritzbox_tools, device_friendly_name), *wifi_entities_list(fritzbox_tools, device_friendly_name),
*profile_entities_list(fritzbox_tools, data_fritz, pref_disable_new_entities), *profile_entities_list(fritzbox_tools, data_fritz),
] ]
@ -337,7 +335,6 @@ async def async_setup_entry(
entry.title, entry.title,
data_fritz, data_fritz,
local_ip, local_ip,
entry.pref_disable_new_entities,
) )
async_add_entities(entities_list) async_add_entities(entities_list)
@ -345,11 +342,7 @@ async def async_setup_entry(
@callback @callback
def update_router() -> None: def update_router() -> None:
"""Update the values of the router.""" """Update the values of the router."""
async_add_entities( async_add_entities(profile_entities_list(fritzbox_tools, data_fritz))
profile_entities_list(
fritzbox_tools, data_fritz, entry.pref_disable_new_entities
)
)
entry.async_on_unload( entry.async_on_unload(
async_dispatcher_connect(hass, fritzbox_tools.signal_device_new, update_router) async_dispatcher_connect(hass, fritzbox_tools.signal_device_new, update_router)