Skip to content

Exclude filter for event types #7627

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 8 commits into from
May 24, 2017
Merged

Exclude filter for event types #7627

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
be7013a
add exclude filter for event types to recorder component
amigian74 May 16, 2017
6dd665e
corrected long line (279)
amigian74 May 17, 2017
31a32fe
change source code structure
amigian74 May 19, 2017
481f917
code cleanup
amigian74 May 19, 2017
95708c2
change source code structure
amigian74 May 24, 2017
ab86919
Merge branch 'dev' into event_type_filter
amigian74 May 24, 2017
5354625
Update __init__.py
balloob May 24, 2017
43e2662
Update test_init.py
balloob May 24, 2017
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
20 changes: 17 additions & 3 deletions homeassistant/components/recorder/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,16 @@

CONF_DB_URL = 'db_url'
CONF_PURGE_DAYS = 'purge_days'
CONF_EVENT_TYPES = 'event_types'

CONNECT_RETRY_WAIT = 3

FILTER_SCHEMA = vol.Schema({
vol.Optional(CONF_EXCLUDE, default={}): vol.Schema({
vol.Optional(CONF_ENTITIES, default=[]): cv.entity_ids,
vol.Optional(CONF_DOMAINS, default=[]):
vol.All(cv.ensure_list, [cv.string]),
vol.Optional(CONF_EVENT_TYPES, default=[]):
vol.All(cv.ensure_list, [cv.string])
}),
vol.Optional(CONF_INCLUDE, default={}): vol.Schema({
Expand Down Expand Up @@ -142,6 +145,7 @@ def __init__(self, hass: HomeAssistant, purge_days: int, uri: str,
self.include_d = include.get(CONF_DOMAINS, [])
self.exclude = exclude.get(CONF_ENTITIES, []) + \
exclude.get(CONF_DOMAINS, [])
self.exclude_t = exclude.get(CONF_EVENT_TYPES, [])

self.get_session = None

Expand Down Expand Up @@ -266,13 +270,23 @@ def do_purge(now):
self.queue.task_done()
continue

with session_scope(session=self.get_session()) as session:
dbevent = None

@balloob balloob May 23, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is still way too difficult. Just add this elif event.event_type == EVENT_TIME_CHANGED::

if event.event_type in self.exclude_t:
    self.queue.task_done()
    continue

dbstate = None
# Exclude event types
if event.event_type not in self.exclude_t:
dbevent = Events.from_event(event)
session.add(dbevent)

if event.event_type == EVENT_STATE_CHANGED:
dbstate = States.from_event(event)
dbstate.event_id = dbevent.event_id

if dbevent is None and dbstate is None:
self.queue.task_done()
continue

with session_scope(session=self.get_session()) as session:
if dbevent is not None:
session.add(dbevent)
if dbstate is not None:
session.add(dbstate)

self.queue.task_done()
Expand Down
19 changes: 19 additions & 0 deletions tests/components/recorder/test_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,18 @@ def _add_entities(hass, entity_ids):
return [st.to_native() for st in session.query(States)]


def _add_events(hass, events):
with session_scope(hass=hass) as session:
session.query(Events).delete(synchronize_session=False)
for event_type, event_data in events.items():
hass.bus.fire(event_type)
hass.block_till_done()
hass.data[DATA_INSTANCE].block_till_done()

with session_scope(hass=hass) as session:
return [ev.to_native() for ev in session.query(Events)]


# pylint: disable=redefined-outer-name,invalid-name
def test_saving_state_include_domains(hass_recorder):
"""Test saving and restoring a state."""
Expand All @@ -131,6 +143,13 @@ def test_saving_state_incl_entities(hass_recorder):
assert hass.states.get('test2.recorder') == states[0]


def test_saving_event_exclude_event_type(hass_recorder):
"""Test saving and restoring an event."""
hass = hass_recorder({'exclude': {'event_types': 'test'}})
events = _add_events(hass, {'test': 'nothing', 'test2': 'something'})
assert len(events) == 1


def test_saving_state_exclude_domains(hass_recorder):
"""Test saving and restoring a state."""
hass = hass_recorder({'exclude': {'domains': 'test'}})
Expand Down