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

Better handling of entity lookups in Universal media player.

Browse Source 
Allowed the lookup function in the Universal Media Player to return
either a state object or the actual state of an entity during lookup.
This commit is contained in:
Ryan Kraus 2016-01-10 20:34:30 -05:00 committed by Paulus Schoutsen
parent 20a1025a8c
commit 36214c73ee
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
homeassistant/components/media_player/universal.py
View File

@ -138,7 +138,7 @@ class UniversalMediaPlayer(MediaPlayerDevice):
# [todo] Update when children update # [todo] Update when children update
def _entity_lkp(self, entity_id=None, state_attr=None): def _entity_lkp(self, entity_id=None, state_attr=None, state_as_obj=True):
""" Looks up an entity state from hass """ """ Looks up an entity state from hass """
if entity_id is None: if entity_id is None:
return return
@ -148,13 +148,17 @@ class UniversalMediaPlayer(MediaPlayerDevice):
if state_obj is None: if state_obj is None:
return return
return state_obj.attributes.get(state_attr) \ if state_attr:
if state_attr else state_obj return state_obj.attributes.get(state_attr)
if state_as_obj:
return state_obj
return state_obj.state
def _override_or_child_attr(self, attr_name): def _override_or_child_attr(self, attr_name):
""" returns either the override or the active child for attr_name """ """ returns either the override or the active child for attr_name """
if attr_name in self._attrs: if attr_name in self._attrs:
return self._entity_lkp(*self._attrs[attr_name]) return self._entity_lkp(*self._attrs[attr_name],
state_as_obj=False)
return self._child_attr(attr_name) return self._child_attr(attr_name)
@ -187,8 +191,9 @@ class UniversalMediaPlayer(MediaPlayerDevice):
def master_state(self): def master_state(self):
""" gets the master state from entity or none """ """ gets the master state from entity or none """
if CONF_STATE in self._attrs: if CONF_STATE in self._attrs:
master_state = self._entity_lkp(*self._attrs[CONF_STATE]) master_state = self._entity_lkp(*self._attrs[CONF_STATE],
return master_state.state if master_state else STATE_OFF state_as_obj=False)
return master_state if master_state else STATE_OFF
else: else:
return None return None