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

Add State.last_updated to JSON obj

Browse Source
This commit is contained in:
Paulus Schoutsen 2015-03-31 23:08:38 -07:00
parent b02c11c31d
commit 00bbc17e11
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
homeassistant/__init__.py
View File

@ -463,7 +463,8 @@ class State(object):
__slots__ = ['entity_id', 'state', 'attributes', __slots__ = ['entity_id', 'state', 'attributes',
'last_changed', 'last_updated'] 'last_changed', 'last_updated']
def __init__(self, entity_id, state, attributes=None, last_changed=None): def __init__(self, entity_id, state, attributes=None, last_changed=None,
last_updated=None):
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: {}. "
@ -472,7 +473,7 @@ class State(object):
self.entity_id = entity_id.lower() self.entity_id = entity_id.lower()
self.state = state self.state = state
self.attributes = attributes or {} self.attributes = attributes or {}
self.last_updated = dt.datetime.now() self.last_updated = last_updated or dt.datetime.now()
# Strip microsecond from last_changed else we cannot guarantee # Strip microsecond from last_changed else we cannot guarantee
# state == State.from_dict(state.as_dict()) # state == State.from_dict(state.as_dict())
@ -510,7 +511,8 @@ class State(object):
return {'entity_id': self.entity_id, return {'entity_id': self.entity_id,
'state': self.state, 'state': self.state,
'attributes': self.attributes, 'attributes': self.attributes,
'last_changed': util.datetime_to_str(self.last_changed)} 'last_changed': util.datetime_to_str(self.last_changed),
'last_updated': util.datetime_to_str(self.last_updated)}
@classmethod @classmethod
def from_dict(cls, json_dict): def from_dict(cls, json_dict):
@ -527,8 +529,13 @@ class State(object):
if last_changed: if last_changed:
last_changed = util.str_to_datetime(last_changed) last_changed = util.str_to_datetime(last_changed)
last_updated = json_dict.get('last_updated')
if last_updated:
last_updated = util.str_to_datetime(last_updated)
return cls(json_dict['entity_id'], json_dict['state'], return cls(json_dict['entity_id'], json_dict['state'],
json_dict.get('attributes'), last_changed) json_dict.get('attributes'), last_changed, last_updated)
def __eq__(self, other): def __eq__(self, other):
return (self.__class__ == other.__class__ and return (self.__class__ == other.__class__ and

3
homeassistant/components/recorder.py
View File

@ -60,7 +60,8 @@ def row_to_state(row):
""" Convert a databsae row to a state. """ """ Convert a databsae row to a state. """
try: try:
return State( return State(
row[1], row[2], json.loads(row[3]), datetime.fromtimestamp(row[4])) row[1], row[2], json.loads(row[3]), datetime.fromtimestamp(row[4]),
datetime.fromtimestamp(row[5]))
except ValueError: except ValueError:
# When json.loads fails # When json.loads fails
_LOGGER.exception("Error converting row to state: %s", row) _LOGGER.exception("Error converting row to state: %s", row)