Automation: Add trigger context and expose to action

homeassistant/components/automation/template.py

@@ -9,9 +9,10 @@ import logging
 import voluptuous as vol
 
 from homeassistant.const import (
-    CONF_VALUE_TEMPLATE, EVENT_STATE_CHANGED, CONF_PLATFORM)
+    CONF_VALUE_TEMPLATE, CONF_PLATFORM, MATCH_ALL)
 from homeassistant.exceptions import TemplateError
 from homeassistant.helpers import template
+from homeassistant.helpers.event import track_state_change
 import homeassistant.helpers.config_validation as cv
 
 
@@ -30,7 +31,7 @@ def trigger(hass, config, action):
     # Local variable to keep track of if the action has already been triggered
     already_triggered = False
 
-    def event_listener(event):
+    def state_changed_listener(entity_id, from_s, to_s):
         """Listen for state changes and calls action."""
         nonlocal already_triggered
         template_result = _check_template(hass, value_template)
@@ -38,11 +39,18 @@ def trigger(hass, config, action):
         # Check to see if template returns true
         if template_result and not already_triggered:
             already_triggered = True
-            action()
+            action({
+                'trigger': {
+                    'platform': 'template',
+                    'entity_id': entity_id,
+                    'from_state': from_s,
+                    'to_state': to_s,
+                },
+            })
         elif not template_result:
             already_triggered = False
 
-    hass.bus.listen(EVENT_STATE_CHANGED, event_listener)
+    track_state_change(hass, MATCH_ALL, state_changed_listener)
     return True
 
 
@@ -50,13 +58,14 @@ def if_action(hass, config):
     """Wrap action method with state based condition."""
     value_template = config.get(CONF_VALUE_TEMPLATE)
 
-    return lambda: _check_template(hass, value_template)
+    return lambda variables: _check_template(hass, value_template,
+                                             variables=variables)
 
 
-def _check_template(hass, value_template):
+def _check_template(hass, value_template, variables=None):
     """Check if result of template is true."""
     try:
-        value = template.render(hass, value_template, {})
+        value = template.render(hass, value_template, variables)
     except TemplateError as ex:
         if ex.args and ex.args[0].startswith(
                 "UndefinedError: 'None' has no attribute"):