Exclude filter for event types

homeassistant/components/recorder/__init__.py

@@ -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({
@@ -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
 
@@ -266,13 +270,23 @@ def do_purge(now):
                     self.queue.task_done()
                     continue
 
-            with session_scope(session=self.get_session()) as session:
+            dbevent = None
+            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()

tests/components/recorder/test_init.py

@@ -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."""
@@ -131,6 +143,14 @@ 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
+    #assert hass.e.get('test2.recorder') == states[0]
+
+
 def test_saving_state_exclude_domains(hass_recorder):
     """Test saving and restoring a state."""
     hass = hass_recorder({'exclude': {'domains': 'test'}})