jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-04-25 01:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve lists in integrations [C-D] (#113072)

Browse Source
This commit is contained in:
Joost Lekkerkerker 2024-03-11 18:58:35 +01:00 committed by GitHub
parent 4d77bec681
commit c75342bd9a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
32 changed files with 276 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
homeassistant/components/canary/camera.py
View File

@ -64,12 +64,9 @@ async def async_setup_entry(
ffmpeg_arguments: str = entry.options.get(
CONF_FFMPEG_ARGUMENTS, DEFAULT_FFMPEG_ARGUMENTS
)
cameras: list[CanaryCamera] = []
for location_id, location in coordinator.data["locations"].items():
for device in location.devices:
if device.is_online:
cameras.append(
async_add_entities(
(
CanaryCamera(
hass,
coordinator,
@ -77,10 +74,13 @@ async def async_setup_entry(
device,
ffmpeg_arguments,
)
for location_id, location in coordinator.data["locations"].items()
for device in location.devices
if device.is_online
),
True,
)
async_add_entities(cameras, True)
class CanaryCamera(CoordinatorEntity[CanaryDataUpdateCoordinator], Camera):
"""An implementation of a Canary security camera."""

6
homeassistant/components/canary/sensor.py
View File

@ -75,10 +75,10 @@ async def async_setup_entry(
for device in location.devices:
if device.is_online:
device_type = device.device_type
for sensor_type in SENSOR_TYPES:
if device_type.get("name") in sensor_type[4]:
sensors.append(
sensors.extend(
CanarySensor(coordinator, sensor_type, location, device)
for sensor_type in SENSOR_TYPES
if device_type.get("name") in sensor_type[4]
)
async_add_entities(sensors, True)

16
homeassistant/components/cloud/http_api.py
View File

@ -649,16 +649,14 @@ async def google_assistant_list(
gconf = await cloud.client.get_google_config()
entities = google_helpers.async_get_entities(hass, gconf)
result = []
for entity in entities:
result.append(
result = [
{
"entity_id": entity.entity_id,
"traits": [trait.name for trait in entity.traits()],
"might_2fa": entity.might_2fa_traits(),
}
)
for entity in entities
]
connection.send_result(msg["id"], result)
@ -743,16 +741,14 @@ async def alexa_list(
alexa_config = await cloud.client.get_alexa_config()
entities = alexa_entities.async_get_entities(hass, alexa_config)
result = []
for entity in entities:
result.append(
result = [
{
"entity_id": entity.entity_id,
"display_categories": entity.default_display_categories(),
"interfaces": [ifc.name() for ifc in entity.interfaces()],
}
)
for entity in entities
]
connection.send_result(msg["id"], result)

5
homeassistant/components/coinbase/sensor.py
View File

@ -85,12 +85,11 @@ async def async_setup_entry(
entities.append(AccountSensor(instance, currency))
if CONF_EXCHANGE_RATES in config_entry.options:
rate: str
for rate in config_entry.options[CONF_EXCHANGE_RATES]:
entities.append(
entities.extend(
ExchangeRateSensor(
instance, rate, exchange_base_currency, exchange_precision
)
for rate in config_entry.options[CONF_EXCHANGE_RATES]
)
async_add_entities(entities)

10
homeassistant/components/control4/__init__.py
View File

@ -138,11 +138,11 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
async def get_items_of_category(hass: HomeAssistant, entry: ConfigEntry, category: str):
"""Return a list of all Control4 items with the specified category."""
director_all_items = hass.data[DOMAIN][entry.entry_id][CONF_DIRECTOR_ALL_ITEMS]
return_list = []
for item in director_all_items:
if "categories" in item and category in item["categories"]:
return_list.append(item)
return return_list
return [
item
for item in director_all_items
if "categories" in item and category in item["categories"]
]
class Control4Entity(CoordinatorEntity):

5
homeassistant/components/crownstone/helpers.py
View File

@ -24,8 +24,7 @@ def list_ports_as_str(
if no_usb_option:
ports_as_string.append(DONT_USE_USB)
for port in serial_ports:
ports_as_string.append(
ports_as_string.extend(
usb.human_readable_device_name(
port.device,
port.serial_number,
@ -34,7 +33,9 @@ def list_ports_as_str(
f"{hex(port.vid)[2:]:0>4}".upper() if port.vid else None,
f"{hex(port.pid)[2:]:0>4}".upper() if port.pid else None,
)
for port in serial_ports
)
ports_as_string.append(MANUAL_PATH)
ports_as_string.append(REFRESH_LIST)

6
homeassistant/components/cups/sensor.py
View File

@ -85,8 +85,10 @@ def setup_platform(
dev.append(CupsSensor(data, printer))
if "marker-names" in data.attributes[printer]:
for marker in data.attributes[printer]["marker-names"]:
dev.append(MarkerSensor(data, printer, marker, True))
dev.extend(
MarkerSensor(data, printer, marker, True)
for marker in data.attributes[printer]["marker-names"]
)
add_entities(dev, True)
return

8
homeassistant/components/currencylayer/sensor.py
View File

@ -48,12 +48,12 @@ def setup_platform(
rest = CurrencylayerData(_RESOURCE, parameters)
response = requests.get(_RESOURCE, params=parameters, timeout=10)
sensors = []
for variable in config[CONF_QUOTE]:
sensors.append(CurrencylayerSensor(rest, base, variable))
if "error" in response.json():
return
add_entities(sensors, True)
add_entities(
(CurrencylayerSensor(rest, base, variable) for variable in config[CONF_QUOTE]),
True,
)
class CurrencylayerSensor(SensorEntity):

13
homeassistant/components/danfoss_air/binary_sensor.py
View File

@ -33,12 +33,13 @@ def setup_platform(
["Danfoss Air Away Mode Active", ReadCommand.away_mode, None],
]
dev = []
for sensor in sensors:
dev.append(DanfossAirBinarySensor(data, sensor[0], sensor[1], sensor[2]))
add_entities(dev, True)
add_entities(
(
DanfossAirBinarySensor(data, sensor[0], sensor[1], sensor[2])
for sensor in sensors
),
True,
)
class DanfossAirBinarySensor(BinarySensorEntity):

11
homeassistant/components/danfoss_air/sensor.py
View File

@ -97,15 +97,14 @@ def setup_platform(
],
]
dev = []
for sensor in sensors:
dev.append(
add_entities(
(
DanfossAir(data, sensor[0], sensor[1], sensor[2], sensor[3], sensor[4])
for sensor in sensors
),
True,
)
add_entities(dev, True)
class DanfossAir(SensorEntity):
"""Representation of a Sensor."""

10
homeassistant/components/danfoss_air/switch.py
View File

@ -47,12 +47,10 @@ def setup_platform(
],
]
dev = []
for switch in switches:
dev.append(DanfossAir(data, switch[0], switch[1], switch[2], switch[3]))
add_entities(dev)
add_entities(
DanfossAir(data, switch[0], switch[1], switch[2], switch[3])
for switch in switches
)
class DanfossAir(SwitchEntity):

5
homeassistant/components/deconz/config_flow.py
View File

@ -114,10 +114,7 @@ class DeconzFlowHandler(ConfigFlow, domain=DOMAIN):
LOGGER.debug("Discovered deCONZ gateways %s", pformat(self.bridges))
if self.bridges:
hosts = []
for bridge in self.bridges:
hosts.append(bridge[CONF_HOST])
hosts = [bridge[CONF_HOST] for bridge in self.bridges]
hosts.append(CONF_MANUAL_INPUT)

13
homeassistant/components/decora_wifi/light.py
View File

@ -63,17 +63,18 @@ def setup_platform(
# Gather all the available devices...
perms = session.user.get_residential_permissions()
all_switches = []
all_switches: list = []
for permission in perms:
if permission.residentialAccountId is not None:
acct = ResidentialAccount(session, permission.residentialAccountId)
for residence in acct.get_residences():
for switch in residence.get_iot_switches():
all_switches.append(switch)
all_switches.extend(
switch
for residence in acct.get_residences()
for switch in residence.get_iot_switches()
)
elif permission.residenceId is not None:
residence = Residence(session, permission.residenceId)
for switch in residence.get_iot_switches():
all_switches.append(switch)
all_switches.extend(residence.get_iot_switches())
add_entities(DecoraWifiLight(sw) for sw in all_switches)
except ValueError:

10
homeassistant/components/delijn/sensor.py
View File

@ -64,9 +64,8 @@ async def async_setup_platform(
session = async_get_clientsession(hass)
sensors = []
for nextpassage in config[CONF_NEXT_DEPARTURE]:
sensors.append(
async_add_entities(
(
DeLijnPublicTransportSensor(
Passages(
nextpassage[CONF_STOP_ID],
@ -76,10 +75,11 @@ async def async_setup_platform(
True,
)
)
for nextpassage in config[CONF_NEXT_DEPARTURE]
),
True,
)
async_add_entities(sensors, True)
class DeLijnPublicTransportSensor(SensorEntity):
"""Representation of a Ruter sensor."""

18
homeassistant/components/devolo_home_control/binary_sensor.py
View File

@ -34,28 +34,26 @@ async def async_setup_entry(
entities: list[BinarySensorEntity] = []
for gateway in hass.data[DOMAIN][entry.entry_id]["gateways"]:
for device in gateway.binary_sensor_devices:
for binary_sensor in device.binary_sensor_property:
entities.append(
entities.extend(
DevoloBinaryDeviceEntity(
homecontrol=gateway,
device_instance=device,
element_uid=binary_sensor,
)
for device in gateway.binary_sensor_devices
for binary_sensor in device.binary_sensor_property
)
for device in gateway.devices.values():
if hasattr(device, "remote_control_property"):
for remote in device.remote_control_property:
for index in range(
1, device.remote_control_property[remote].key_count + 1
):
entities.append(
entities.extend(
DevoloRemoteControl(
homecontrol=gateway,
device_instance=device,
element_uid=remote,
key=index,
)
for device in gateway.devices.values()
if hasattr(device, "remote_control_property")
for remote in device.remote_control_property
for index in range(1, device.remote_control_property[remote].key_count + 1)
)
async_add_entities(entities)

24
homeassistant/components/devolo_home_control/climate.py
View File

@ -26,26 +26,24 @@ async def async_setup_entry(
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
) -> None:
"""Get all cover devices and setup them via config entry."""
entities = []
for gateway in hass.data[DOMAIN][entry.entry_id]["gateways"]:
for device in gateway.multi_level_switch_devices:
for multi_level_switch in device.multi_level_switch_property:
if device.device_model_uid in (
"devolo.model.Thermostat:Valve",
"devolo.model.Room:Thermostat",
"devolo.model.Eurotronic:Spirit:Device",
"unk.model.Danfoss:Thermostat",
):
entities.append(
async_add_entities(
DevoloClimateDeviceEntity(
homecontrol=gateway,
device_instance=device,
element_uid=multi_level_switch,
)
for gateway in hass.data[DOMAIN][entry.entry_id]["gateways"]
for device in gateway.multi_level_switch_devices
for multi_level_switch in device.multi_level_switch_property
if device.device_model_uid
in (
"devolo.model.Thermostat:Valve",
"devolo.model.Room:Thermostat",
"devolo.model.Eurotronic:Spirit:Device",
"unk.model.Danfoss:Thermostat",
)
)
async_add_entities(entities)
class DevoloClimateDeviceEntity(DevoloMultiLevelSwitchDeviceEntity, ClimateEntity):

13
homeassistant/components/devolo_home_control/cover.py
View File

@ -21,22 +21,19 @@ async def async_setup_entry(
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
) -> None:
"""Get all cover devices and setup them via config entry."""
entities = []
for gateway in hass.data[DOMAIN][entry.entry_id]["gateways"]:
for device in gateway.multi_level_switch_devices:
for multi_level_switch in device.multi_level_switch_property:
if multi_level_switch.startswith("devolo.Blinds"):
entities.append(
async_add_entities(
DevoloCoverDeviceEntity(
homecontrol=gateway,
device_instance=device,
element_uid=multi_level_switch,
)
for gateway in hass.data[DOMAIN][entry.entry_id]["gateways"]
for device in gateway.multi_level_switch_devices
for multi_level_switch in device.multi_level_switch_property
if multi_level_switch.startswith("devolo.Blinds")
)
async_add_entities(entities)
class DevoloCoverDeviceEntity(DevoloMultiLevelSwitchDeviceEntity, CoverEntity):
"""Representation of a cover device within devolo Home Control."""

7
homeassistant/components/devolo_home_control/diagnostics.py
View File

@ -22,9 +22,7 @@ async def async_get_config_entry_diagnostics(
"""Return diagnostics for a config entry."""
gateways: list[HomeControl] = hass.data[DOMAIN][entry.entry_id]["gateways"]
device_info = []
for gateway in gateways:
device_info.append(
device_info = [
{
"gateway": {
"local_connection": gateway.gateway.local_connection,
@ -40,7 +38,8 @@ async def async_get_config_entry_diagnostics(
for device_id, properties in gateway.devices.items()
],
}
)
for gateway in gateways
]
diag_data = {
"entry": async_redact_data(entry.as_dict(), TO_REDACT),

13
homeassistant/components/devolo_home_control/light.py
View File

@ -20,22 +20,19 @@ async def async_setup_entry(
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
) -> None:
"""Get all light devices and setup them via config entry."""
entities = []
for gateway in hass.data[DOMAIN][entry.entry_id]["gateways"]:
for device in gateway.multi_level_switch_devices:
for multi_level_switch in device.multi_level_switch_property.values():
if multi_level_switch.switch_type == "dimmer":
entities.append(
async_add_entities(
DevoloLightDeviceEntity(
homecontrol=gateway,
device_instance=device,
element_uid=multi_level_switch.element_uid,
)
for gateway in hass.data[DOMAIN][entry.entry_id]["gateways"]
for device in gateway.multi_level_switch_devices
for multi_level_switch in device.multi_level_switch_property.values()
if multi_level_switch.switch_type == "dimmer"
)
async_add_entities(entities)
class DevoloLightDeviceEntity(DevoloMultiLevelSwitchDeviceEntity, LightEntity):
"""Representation of a light within devolo Home Control."""

21
homeassistant/components/devolo_home_control/sensor.py
View File

@ -45,34 +45,35 @@ async def async_setup_entry(
entities: list[SensorEntity] = []
for gateway in hass.data[DOMAIN][entry.entry_id]["gateways"]:
for device in gateway.multi_level_sensor_devices:
for multi_level_sensor in device.multi_level_sensor_property:
entities.append(
entities.extend(
DevoloGenericMultiLevelDeviceEntity(
homecontrol=gateway,
device_instance=device,
element_uid=multi_level_sensor,
)
for device in gateway.multi_level_sensor_devices
for multi_level_sensor in device.multi_level_sensor_property
)
for device in gateway.devices.values():
if hasattr(device, "consumption_property"):
for consumption in device.consumption_property:
for consumption_type in ("current", "total"):
entities.append(
entities.extend(
DevoloConsumptionEntity(
homecontrol=gateway,
device_instance=device,
element_uid=consumption,
consumption=consumption_type,
)
for device in gateway.devices.values()
if hasattr(device, "consumption_property")
for consumption in device.consumption_property
for consumption_type in ("current", "total")
)
if hasattr(device, "battery_level"):
entities.append(
entities.extend(
DevoloBatteryEntity(
homecontrol=gateway,
device_instance=device,
element_uid=f"devolo.BatterySensor:{device.uid}",
)
for device in gateway.devices.values()
if hasattr(device, "battery_level")
)
async_add_entities(entities)

13
homeassistant/components/devolo_home_control/siren.py
View File

@ -18,22 +18,19 @@ async def async_setup_entry(
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
) -> None:
"""Get all binary sensor and multi level sensor devices and setup them via config entry."""
entities = []
for gateway in hass.data[DOMAIN][entry.entry_id]["gateways"]:
for device in gateway.multi_level_switch_devices:
for multi_level_switch in device.multi_level_switch_property:
if multi_level_switch.startswith("devolo.SirenMultiLevelSwitch"):
entities.append(
async_add_entities(
DevoloSirenDeviceEntity(
homecontrol=gateway,
device_instance=device,
element_uid=multi_level_switch,
)
for gateway in hass.data[DOMAIN][entry.entry_id]["gateways"]
for device in gateway.multi_level_switch_devices
for multi_level_switch in device.multi_level_switch_property
if multi_level_switch.startswith("devolo.SirenMultiLevelSwitch")
)
async_add_entities(entities)
class DevoloSirenDeviceEntity(DevoloMultiLevelSwitchDeviceEntity, SirenEntity):
"""Representation of a cover device within devolo Home Control."""

17
homeassistant/components/devolo_home_control/switch.py
View File

@ -20,24 +20,21 @@ async def async_setup_entry(
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
) -> None:
"""Get all devices and setup the switch devices via config entry."""
entities = []
for gateway in hass.data[DOMAIN][entry.entry_id]["gateways"]:
for device in gateway.binary_switch_devices:
for binary_switch in device.binary_switch_property:
# Exclude the binary switch which also has multi_level_switches here,
# because those are implemented as light entities now.
if not hasattr(device, "multi_level_switch_property"):
entities.append(
async_add_entities(
DevoloSwitch(
homecontrol=gateway,
device_instance=device,
element_uid=binary_switch,
)
for gateway in hass.data[DOMAIN][entry.entry_id]["gateways"]
for device in gateway.binary_switch_devices
for binary_switch in device.binary_switch_property
# Exclude the binary switch which also has multi_level_switches here,
# because those are implemented as light entities now.
if not hasattr(device, "multi_level_switch_property")
)
async_add_entities(entities)
class DevoloSwitch(DevoloDeviceEntity, SwitchEntity):
"""Representation of a switch."""

10
homeassistant/components/directv/media_player.py
View File

@ -60,19 +60,19 @@ async def async_setup_entry(
) -> None:
"""Set up the DirecTV config entry."""
dtv = hass.data[DOMAIN][entry.entry_id]
entities = []
for location in dtv.device.locations:
entities.append(
async_add_entities(
(
DIRECTVMediaPlayer(
dtv=dtv,
name=str.title(location.name),
address=location.address,
)
for location in dtv.device.locations
),
True,
)
async_add_entities(entities, True)
class DIRECTVMediaPlayer(DIRECTVEntity, MediaPlayerEntity):
"""Representation of a DirecTV receiver on the network."""

10
homeassistant/components/directv/remote.py
View File

@ -29,19 +29,19 @@ async def async_setup_entry(
) -> None:
"""Load DirecTV remote based on a config entry."""
dtv = hass.data[DOMAIN][entry.entry_id]
entities = []
for location in dtv.device.locations:
entities.append(
async_add_entities(
(
DIRECTVRemote(
dtv=dtv,
name=str.title(location.name),
address=location.address,
)
for location in dtv.device.locations
),
True,
)
async_add_entities(entities, True)
class DIRECTVRemote(DIRECTVEntity, RemoteEntity):
"""Device that sends commands to a DirecTV receiver."""

7
homeassistant/components/dlib_face_detect/image_processing.py
View File

@ -24,14 +24,11 @@ def setup_platform(
discovery_info: DiscoveryInfoType | None = None,
) -> None:
"""Set up the Dlib Face detection platform."""
entities = []
for camera in config[CONF_SOURCE]:
entities.append(
add_entities(
DlibFaceDetectEntity(camera[CONF_ENTITY_ID], camera.get(CONF_NAME))
for camera in config[CONF_SOURCE]
)
add_entities(entities)
class DlibFaceDetectEntity(ImageProcessingFaceEntity):
"""Dlib Face API entity for identify."""

7
homeassistant/components/dlib_face_identify/image_processing.py
View File

@ -38,19 +38,16 @@ def setup_platform(
discovery_info: DiscoveryInfoType | None = None,
) -> None:
"""Set up the Dlib Face detection platform."""
entities = []
for camera in config[CONF_SOURCE]:
entities.append(
add_entities(
DlibFaceIdentifyEntity(
camera[CONF_ENTITY_ID],
config[CONF_FACES],
camera.get(CONF_NAME),
config[CONF_CONFIDENCE],
)
for camera in config[CONF_SOURCE]
)
add_entities(entities)
class DlibFaceIdentifyEntity(ImageProcessingFaceEntity):
"""Dlib Face API entity for identify."""

6
homeassistant/components/doods/image_processing.py
View File

@ -112,9 +112,7 @@ def setup_platform(
)
return
entities = []
for camera in config[CONF_SOURCE]:
entities.append(
add_entities(
Doods(
hass,
camera[CONF_ENTITY_ID],
@ -123,8 +121,8 @@ def setup_platform(
detector,
config,
)
for camera in config[CONF_SOURCE]
)
add_entities(entities)
class Doods(ImageProcessingEntity):

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

@ -531,9 +531,7 @@ async def async_setup_entry(
add_entities_handler = None
if dsmr_version == "5B":
mbus_entities = create_mbus_entities(hass, telegram, entry)
for mbus_entity in mbus_entities:
entities.append(mbus_entity)
entities.extend(create_mbus_entities(hass, telegram, entry))
entities.extend(
[

9
homeassistant/components/dynalite/__init__.py
View File

@ -65,10 +65,11 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
async def dynalite_service(service_call: ServiceCall) -> None:
data = service_call.data
host = data.get(ATTR_HOST, "")
bridges = []
for cur_bridge in hass.data[DOMAIN].values():
if not host or cur_bridge.host == host:
bridges.append(cur_bridge)
bridges = [
bridge
for bridge in hass.data[DOMAIN].values()
if not host or bridge.host == host
]
LOGGER.debug("Selected bridged for service call: %s", bridges)
if service_call.service == SERVICE_REQUEST_AREA_PRESET:
bridge_attr = "request_area_preset"

4
homeassistant/components/dynalite/dynalitebase.py
View File

@ -31,9 +31,7 @@ def async_setup_entry_base(
@callback
def async_add_entities_platform(devices):
# assumes it is called with a single platform
added_entities = []
for device in devices:
added_entities.append(entity_from_device(device, bridge))
added_entities = [entity_from_device(device, bridge) for device in devices]
async_add_entities(added_entities)
bridge.register_add_devices(platform, async_add_entities_platform)

11
tests/components/climate/test_init.py
View File

@ -157,11 +157,12 @@ async def test_sync_turn_off(hass: HomeAssistant) -> None:
def _create_tuples(enum: Enum, constant_prefix: str) -> list[tuple[Enum, str]]:
result = []
for enum in enum:
if enum not in [ClimateEntityFeature.TURN_ON, ClimateEntityFeature.TURN_OFF]:
result.append((enum, constant_prefix))
return result
return [
(enum_field, constant_prefix)
for enum_field in enum
if enum_field
not in [ClimateEntityFeature.TURN_ON, ClimateEntityFeature.TURN_OFF]
]
@pytest.mark.parametrize(

5
tests/components/cover/test_init.py
View File

@ -140,10 +140,7 @@ def is_closing(hass, ent):
def _create_tuples(enum: Enum, constant_prefix: str) -> list[tuple[Enum, str]]:
result = []
for enum in enum:
result.append((enum, constant_prefix))
return result
return [(enum_field, constant_prefix) for enum_field in enum]
def test_all() -> None: