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

State.last_changed only changes if state changes

Browse Source 
No longer affected if just the attributes get updated.
This commit is contained in:
Paulus Schoutsen 2015-01-02 08:48:20 -08:00
parent 1ebaf7fd36
commit f64e84d087
2 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ha_test/test_core.py
View File

@ -198,14 +198,15 @@ class TestState(unittest.TestCase):
def test_repr(self): def test_repr(self):
""" Test state.repr """ """ Test state.repr """
self.assertEqual("<state on @ 12:00:00 08-12-1984>", self.assertEqual("<state happy.happy=on @ 12:00:00 08-12-1984>",
str(ha.State( str(ha.State(
"happy.happy", "on", "happy.happy", "on",
last_changed=datetime(1984, 12, 8, 12, 0, 0)))) last_changed=datetime(1984, 12, 8, 12, 0, 0))))
self.assertEqual("<state on:brightness=144 @ 12:00:00 08-12-1984>", self.assertEqual(
str(ha.State("happy.happy", "on", {"brightness": 144}, "<state happy.happy=on; brightness=144 @ 12:00:00 08-12-1984>",
datetime(1984, 12, 8, 12, 0, 0)))) str(ha.State("happy.happy", "on", {"brightness": 144},
datetime(1984, 12, 8, 12, 0, 0))))
class TestStateMachine(unittest.TestCase): class TestStateMachine(unittest.TestCase):
@ -298,6 +299,16 @@ class TestStateMachine(unittest.TestCase):
self.assertTrue(self.states.is_state('light.bowl', 'off')) self.assertTrue(self.states.is_state('light.bowl', 'off'))
self.assertEqual(1, len(runs)) self.assertEqual(1, len(runs))
def test_last_changed_not_updated_on_same_state(self):
state = self.states.get('light.Bowl')
time.sleep(1)
self.states.set("light.Bowl", "on")
self.assertEqual(state.last_changed,
self.states.get('light.Bowl').last_changed)
class TestServiceCall(unittest.TestCase): class TestServiceCall(unittest.TestCase):
""" Test ServiceCall class. """ """ Test ServiceCall class. """

42
homeassistant/__init__.py
View File

@ -412,7 +412,14 @@ class EventBus(object):
class State(object): class State(object):
""" Object to represent a state within the state machine. """ """
Object to represent a state within the state machine.
entity_id: the entity that is represented.
state: the state of the entity
attributes: extra information on entity and state
last_changed: last time the state was changed, not the attributes.
"""
__slots__ = ['entity_id', 'state', 'attributes', 'last_changed'] __slots__ = ['entity_id', 'state', 'attributes', 'last_changed']
@ -420,7 +427,7 @@ class State(object):
if not ENTITY_ID_PATTERN.match(entity_id): if not ENTITY_ID_PATTERN.match(entity_id):
raise InvalidEntityFormatError(( raise InvalidEntityFormatError((
"Invalid entity id encountered: {}. " "Invalid entity id encountered: {}. "
"Format should be <domain>.<entity>").format(entity_id)) "Format should be <domain>.<object_id>").format(entity_id))
self.entity_id = entity_id self.entity_id = entity_id
self.state = state self.state = state
@ -467,17 +474,17 @@ class State(object):
def __eq__(self, other): def __eq__(self, other):
return (self.__class__ == other.__class__ and return (self.__class__ == other.__class__ and
self.entity_id == other.entity_id and
self.state == other.state and self.state == other.state and
self.attributes == other.attributes) self.attributes == other.attributes)
def __repr__(self): def __repr__(self):
if self.attributes: attr = "; {}".format(util.repr_helper(self.attributes)) \
return "<state {}:{} @ {}>".format( if self.attributes else ""
self.state, util.repr_helper(self.attributes),
util.datetime_to_str(self.last_changed)) return "<state {}={}{} @ {}>".format(
else: self.entity_id, self.state, attr,
return "<state {} @ {}>".format( util.datetime_to_str(self.last_changed))
self.state, util.datetime_to_str(self.last_changed))
class StateMachine(object): class StateMachine(object):
@ -538,20 +545,27 @@ class StateMachine(object):
def set(self, entity_id, new_state, attributes=None): def set(self, entity_id, new_state, attributes=None):
""" Set the state of an entity, add entity if it does not exist. """ Set the state of an entity, add entity if it does not exist.
Attributes is an optional dict to specify attributes of this state. """ Attributes is an optional dict to specify attributes of this state.
If you just update the attributes and not the state, last changed will
not be affected.
"""
attributes = attributes or {} attributes = attributes or {}
with self._lock: with self._lock:
old_state = self._states.get(entity_id) old_state = self._states.get(entity_id)
is_existing = old_state is not None
same_state = is_existing and old_state.state == new_state
same_attr = is_existing and old_state.attributes == attributes
# If state did not exist or is different, set it # If state did not exist or is different, set it
if not old_state or \ if not (same_state and same_attr):
old_state.state != new_state or \ last_changed = old_state.last_changed if same_state else None
old_state.attributes != attributes:
state = self._states[entity_id] = \ state = self._states[entity_id] = \
State(entity_id, new_state, attributes) State(entity_id, new_state, attributes, last_changed)
event_data = {'entity_id': entity_id, 'new_state': state} event_data = {'entity_id': entity_id, 'new_state': state}