thomas/hass-config
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes to entity handler. Allow entities managed by appd

Browse Source
This commit is contained in:
Thomas Lovén 2018-12-27 23:34:20 +01:00
parent 28ce1522ec
commit 975cbf2da0
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
appdaemon/apps/base.py
View File

@ -53,19 +53,24 @@ class Entities(Base):
self.e = {} self.e = {}
def register_entity(self, name, entity): def register_entity(self, name, entity, managed=False, default=None, attributes=None):
domain, _ = entity.split('.') domain, _ = entity.split('.')
controller = { controller = {
'light': Entities.LightEntity, 'light': Entities.LightEntity,
}.get(domain, Entities.Entity) }.get(domain, Entities.Entity)
self.e[name] = controller(self, entity) self.e[name] = controller(self, entity, managed, default, attributes)
class Entity: class Entity:
def __init__(self, hass, entity): def __init__(self, hass, entity, managed = False, default = None, attributes = None):
self._entity = entity self._entity = entity
self._hass = hass self._hass = hass
self._hass.listen_state(self._listener, entity=entity, attributes='all') self._hass.listen_state(self._listener, entity=entity, attributes='all')
self._listeners = [] self._listeners = []
if managed:
if default:
self.state = default
for k,v in attributes.items():
setattr(self, k, v)
def listen(self, callback, kwarg=None): def listen(self, callback, kwarg=None):
""" Listen to changes to entity state """ """ Listen to changes to entity state """
@ -82,22 +87,20 @@ class Entities(Base):
for l in self._listeners: for l in self._listeners:
l['callback'](l['kwarg']) l['callback'](l['kwarg'])
@property
def state(self):
return self._hass.get_state(self._entity)
@state.setter
def state(self, state):
self._hass.set_state(self._entity, state=state)
def __getattr__(self, key): def __getattr__(self, key):
if key == 'state':
return self._hass.get_state(self._entity)
return self._hass.get_state(self._entity, return self._hass.get_state(self._entity,
attribute='all')['attributes'].get(key, None) attribute=key)
def __setattr__(self, key, value): def __setattr__(self, key, value):
if key.startswith('_'): if key.startswith('_'):
self.__dict__[key] = value self.__dict__[key] = value
return return
if key == 'state':
return self._hass.set_state(self._entity, state=value)
attr = self._hass.get_state(self._entity, attr = self._hass.get_state(self._entity,
attribute='all')['attributes'] attribute='all')
attr = attr.get('attributes', {}) if attr else {}
attr[key] = value attr[key] = value
self._hass.set_state(self._entity, attributes=attr) self._hass.set_state(self._entity, attributes=attr)
def __delattr__(self, key): def __delattr__(self, key):
@ -105,7 +108,7 @@ class Entities(Base):
del self.__dict__[key] del self.__dict__[key]
return return
attr = self._hass.get_state(self._entity, attr = self._hass.get_state(self._entity,
attribute='all')['attributes'] attribute='all').get('attributes', {})
attr[key] = '' attr[key] = ''
self._hass.set_state(self._entity, attributes=attr) self._hass.set_state(self._entity, attributes=attr)