Skip to content

Remove logbook split_entity_id caching #71359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 2 commits into from
May 5, 2022
Merged

Remove logbook split_entity_id caching #71359

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e631e4a
Remove logbook split_entity_id caching
bdraco May 5, 2022
c66fda6
Merge remote-tracking branch 'upstream/dev' into remove_logbook_split…
bdraco May 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions homeassistant/components/logbook/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,10 +354,11 @@ def humanify(
# Process events
for event in events_batch:
if event.event_type == EVENT_STATE_CHANGED:
if event.domain != SENSOR_DOMAIN:
continue
entity_id = event.entity_id
if entity_id in continuous_sensors:
if (
entity_id in continuous_sensors
or split_entity_id(entity_id)[0] != SENSOR_DOMAIN
):
continue
assert entity_id is not None
continuous_sensors[entity_id] = _is_sensor_continuous(hass, entity_id)
Expand All @@ -378,10 +379,9 @@ def humanify(
for event in events_batch:
if event.event_type == EVENT_STATE_CHANGED:
entity_id = event.entity_id
domain = event.domain
assert entity_id is not None

if domain == SENSOR_DOMAIN and continuous_sensors[entity_id]:
if continuous_sensors.get(entity_id):
# Skip continuous sensors
continue

Expand Down Expand Up @@ -872,14 +872,6 @@ def __init__(
self.time_fired_minute: int = self._row.time_fired.minute
self._event_data_cache = event_data_cache

@property
def domain(self) -> str | None:
"""Return the domain for the state."""
if self._domain is None:
assert self.entity_id is not None
self._domain = split_entity_id(self.entity_id)[0]
return self._domain

@property
def attributes_icon(self) -> str | None:
"""Extract the icon from the decoded attributes or json."""
Expand Down