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

Align code between group platforms (#74057)

Browse source
This commit is contained in:
Erik Montnemery 2022-06-28 08:50:31 +02:00 • committed by GitHub
parent fb10853358
commit cc8170fcfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

18
homeassistant/components/group/light.py
View file

@ -46,7 +46,7 @@ from homeassistant.const import (
STATE_UNAVAILABLE,
STATE_UNKNOWN,
)
from homeassistant.core import Event, HomeAssistant, State, callback
from homeassistant.core import Event, HomeAssistant, callback
from homeassistant.helpers import config_validation as cv, entity_registry as er
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.event import async_track_state_change_event
@ -214,15 +214,15 @@ class LightGroup(GroupEntity, LightEntity):
@callback
def async_update_group_state(self) -> None:
"""Query all members and determine the light group state."""
all_states = [self.hass.states.get(x) for x in self._entity_ids]
states: list[State] = list(filter(None, all_states))
states = [
state
for entity_id in self._entity_ids
if (state := self.hass.states.get(entity_id)) is not None
]
on_states = [state for state in states if state.state == STATE_ON]
# filtered_states are members currently in the state machine
filtered_states: list[str] = [x.state for x in all_states if x is not None]
valid_state = self.mode(
state not in (STATE_UNKNOWN, STATE_UNAVAILABLE) for state in filtered_states
state.state not in (STATE_UNKNOWN, STATE_UNAVAILABLE) for state in states
)
if not valid_state:
@ -230,9 +230,7 @@ class LightGroup(GroupEntity, LightEntity):
self._attr_is_on = None
else:
# Set as ON if any / all member is ON
self._attr_is_on = self.mode(
list(map(lambda x: x == STATE_ON, filtered_states))
)
self._attr_is_on = self.mode(state.state == STATE_ON for state in states)
self._attr_available = any(state.state != STATE_UNAVAILABLE for state in states)
self._attr_brightness = reduce_attribute(on_states, ATTR_BRIGHTNESS)