jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 11:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow hiding automation entities from UIs (#3442)

Browse Source 
* Allow hiding automation entities from UIs

* Flake8 fixes: Allow hiding automation entities from UIs

* Automation: Rework hide entity feature

 * Refactor keyword 'hidden' to 'hide_entity' to avoid ambiguity
 * Migrate hide_entity subsetting to Voluptuous
This commit is contained in:
Micha LaQua 2016-09-20 08:39:07 +02:00 committed by Paulus Schoutsen
parent ae1b69430e
commit d31f6bc3f0
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
homeassistant/components/automation/__init__.py
View File

@ -30,6 +30,7 @@ ENTITY_ID_FORMAT = DOMAIN + '.{}'
DEPENDENCIES = ['group'] DEPENDENCIES = ['group']
CONF_ALIAS = 'alias' CONF_ALIAS = 'alias'
CONF_HIDE_ENTITY = 'hide_entity'
CONF_CONDITION = 'condition' CONF_CONDITION = 'condition'
CONF_ACTION = 'action' CONF_ACTION = 'action'
@ -41,6 +42,7 @@ CONDITION_TYPE_AND = 'and'
CONDITION_TYPE_OR = 'or' CONDITION_TYPE_OR = 'or'
DEFAULT_CONDITION_TYPE = CONDITION_TYPE_AND DEFAULT_CONDITION_TYPE = CONDITION_TYPE_AND
DEFAULT_HIDE_ENTITY = False
METHOD_TRIGGER = 'trigger' METHOD_TRIGGER = 'trigger'
METHOD_IF_ACTION = 'if_action' METHOD_IF_ACTION = 'if_action'
@ -99,6 +101,7 @@ _CONDITION_SCHEMA = vol.Any(
PLATFORM_SCHEMA = vol.Schema({ PLATFORM_SCHEMA = vol.Schema({
CONF_ALIAS: cv.string, CONF_ALIAS: cv.string,
vol.Optional(CONF_HIDE_ENTITY, default=DEFAULT_HIDE_ENTITY): cv.boolean,
vol.Required(CONF_TRIGGER): _TRIGGER_SCHEMA, vol.Required(CONF_TRIGGER): _TRIGGER_SCHEMA,
vol.Required(CONF_CONDITION_TYPE, default=DEFAULT_CONDITION_TYPE): vol.Required(CONF_CONDITION_TYPE, default=DEFAULT_CONDITION_TYPE):
vol.All(vol.Lower, vol.Any(CONDITION_TYPE_AND, CONDITION_TYPE_OR)), vol.All(vol.Lower, vol.Any(CONDITION_TYPE_AND, CONDITION_TYPE_OR)),
@ -206,7 +209,8 @@ def setup(hass, config):
class AutomationEntity(ToggleEntity): class AutomationEntity(ToggleEntity):
"""Entity to show status of entity.""" """Entity to show status of entity."""
def __init__(self, name, attach_triggers, cond_func, action): # pylint: disable=too-many-arguments, too-many-instance-attributes
def __init__(self, name, attach_triggers, cond_func, action, hidden):
"""Initialize an automation entity.""" """Initialize an automation entity."""
self._name = name self._name = name
self._attach_triggers = attach_triggers self._attach_triggers = attach_triggers
@ -215,6 +219,7 @@ class AutomationEntity(ToggleEntity):
self._action = action self._action = action
self._enabled = True self._enabled = True
self._last_triggered = None self._last_triggered = None
self._hidden = hidden
@property @property
def name(self): def name(self):
@ -233,6 +238,11 @@ class AutomationEntity(ToggleEntity):
ATTR_LAST_TRIGGERED: self._last_triggered ATTR_LAST_TRIGGERED: self._last_triggered
} }
@property
def hidden(self) -> bool:
"""Return True if the automation entity should be hidden from UIs."""
return self._hidden
@property @property
def is_on(self) -> bool: def is_on(self) -> bool:
"""Return True if entity is on.""" """Return True if entity is on."""
@ -281,6 +291,8 @@ def _process_config(hass, config, component):
name = config_block.get(CONF_ALIAS) or "{} {}".format(config_key, name = config_block.get(CONF_ALIAS) or "{} {}".format(config_key,
list_no) list_no)
hidden = config_block[CONF_HIDE_ENTITY]
action = _get_action(hass, config_block.get(CONF_ACTION, {}), name) action = _get_action(hass, config_block.get(CONF_ACTION, {}), name)
if CONF_CONDITION in config_block: if CONF_CONDITION in config_block:
@ -295,7 +307,8 @@ def _process_config(hass, config, component):
attach_triggers = partial(_process_trigger, hass, config, attach_triggers = partial(_process_trigger, hass, config,
config_block.get(CONF_TRIGGER, []), name) config_block.get(CONF_TRIGGER, []), name)
entity = AutomationEntity(name, attach_triggers, cond_func, action) entity = AutomationEntity(name, attach_triggers, cond_func, action,
hidden)
component.add_entities((entity,)) component.add_entities((entity,))
success = True success = True