home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-08-14 10:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
J. Nick Koston
2025-06-23 16:15:30 +02:00
parent 38b4d49375
commit c2af973332
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
homeassistant/components/esphome/manager.py
View File

@@ -802,11 +802,11 @@ def _async_setup_device_registry(
) )
suggested_area: str | None = None suggested_area: str | None = None
if device_info.suggested_area: if device_info.area:
suggested_area = device_info.suggested_area # Prefer device_info.area over suggested_area
elif device_info.area:
# Use main device area if suggested_area is not set
suggested_area = device_info.area.name suggested_area = device_info.area.name
elif device_info.suggested_area:
suggested_area = device_info.suggested_area
# Create/update main device # Create/update main device
device_entry = device_registry.async_get_or_create( device_entry = device_registry.async_get_or_create(
@@ -823,6 +823,9 @@ def _async_setup_device_registry(
# Handle sub devices # Handle sub devices
# Find available areas from device_info # Find available areas from device_info
areas_by_id = {area.area_id: area for area in device_info.areas} areas_by_id = {area.area_id: area for area in device_info.areas}
# Add the main device's area if it exists
if device_info.area:
areas_by_id[device_info.area.area_id] = device_info.area
# Create/update sub devices that should exist # Create/update sub devices that should exist
for sub_device in device_info.devices: for sub_device in device_info.devices:
# Determine the area for this sub device # Determine the area for this sub device