Add event listener
This commit is contained in:
@@ -5,6 +5,8 @@ import logging
|
|||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
import voluptuous as vol
|
import voluptuous as vol
|
||||||
|
|
||||||
|
|
||||||
|
from aiohttp.web import json_response
|
||||||
from georideapilib.objects import GeorideAccount
|
from georideapilib.objects import GeorideAccount
|
||||||
import georideapilib.api as GeorideApi
|
import georideapilib.api as GeorideApi
|
||||||
|
|
||||||
@@ -51,6 +53,17 @@ async def async_setup(hass, config):
|
|||||||
_LOGGER.info("Georide-setup ")
|
_LOGGER.info("Georide-setup ")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Return boolean to indicate that initialization was successful.
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
async def async_setup_entry(hass, entry):
|
||||||
|
"""Set up Georide entry."""
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def georide_update(event):
|
def georide_update(event):
|
||||||
"""Update tracker info"""
|
"""Update tracker info"""
|
||||||
nonlocal hass
|
nonlocal hass
|
||||||
@@ -60,26 +73,16 @@ async def async_setup(hass, config):
|
|||||||
|
|
||||||
token = georide_context.async_get_token()
|
token = georide_context.async_get_token()
|
||||||
trackers = GeorideApi.get_trackers(token)
|
trackers = GeorideApi.get_trackers(token)
|
||||||
|
|
||||||
_LOGGER.info('Georide Trackers event %s', trackers)
|
|
||||||
georide_context.georide_trackers = trackers
|
georide_context.georide_trackers = trackers
|
||||||
|
hass.helpers.dispatcher.async_dispatcher_send(DOMAIN, hass, georide_context, json_response([]))
|
||||||
hass.bus.fire(DOMAIN + '_trackers_update', {
|
|
||||||
'trackers': trackers
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
ha_event.async_track_time_interval(hass, georide_update, timedelta(seconds=30))
|
ha_event.async_track_time_interval(hass, georide_update, timedelta(seconds=30))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Return boolean to indicate that initialization was successful.
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
async def async_setup_entry(hass, entry):
|
|
||||||
"""Set up Georide entry."""
|
|
||||||
config = hass.data[DOMAIN]["config"]
|
config = hass.data[DOMAIN]["config"]
|
||||||
email = config.get(CONF_EMAIL) or entry.data[CONF_EMAIL]
|
email = config.get(CONF_EMAIL) or entry.data[CONF_EMAIL]
|
||||||
password = config.get(CONF_PASSWORD) or entry.data[CONF_PASSWORD]
|
password = config.get(CONF_PASSWORD) or entry.data[CONF_PASSWORD]
|
||||||
@@ -128,6 +131,7 @@ class GeorideContext:
|
|||||||
self._password = password
|
self._password = password
|
||||||
self._georide_trackers = defaultdict(set)
|
self._georide_trackers = defaultdict(set)
|
||||||
self._token = token
|
self._token = token
|
||||||
|
self._pending_msg = []
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def hass(self):
|
def hass(self):
|
||||||
@@ -163,3 +167,18 @@ class GeorideContext:
|
|||||||
def async_get_token(self):
|
def async_get_token(self):
|
||||||
""" here we return the current valid tocken, TODO: add here token expiration control"""
|
""" here we return the current valid tocken, TODO: add here token expiration control"""
|
||||||
return self._token
|
return self._token
|
||||||
|
|
||||||
|
@callback
|
||||||
|
def async_get_tracker(self, tracker_id):
|
||||||
|
""" here we return the current valid tocken, TODO: add here token expiration control"""
|
||||||
|
for tracker in self._georide_trackers:
|
||||||
|
if tracker.tracker_id == tracker_id:
|
||||||
|
return tracker
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
@callback
|
||||||
|
def async_see(self, **data):
|
||||||
|
"""Send a see message to the device tracker."""
|
||||||
|
_LOGGER.info("sync_see")
|
||||||
|
self._pending_msg.append(data)
|
||||||
|
|||||||
@@ -94,7 +94,8 @@ class GeorideTrackerEntity(TrackerEntity):
|
|||||||
return {
|
return {
|
||||||
"name": self.name,
|
"name": self.name,
|
||||||
"identifiers": {(GEORIDE_DOMAIN, self._tracker_id)},
|
"identifiers": {(GEORIDE_DOMAIN, self._tracker_id)},
|
||||||
"manufacturer": "GeoRide"
|
"manufacturer": "GeoRide",
|
||||||
|
"odometer": "{} km".format(self._data.odometer)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -13,31 +13,31 @@ from . import DOMAIN as GEORIDE_DOMAIN
|
|||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: disable=W0613
|
async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: disable=W0613
|
||||||
"""Set up Georide tracker based off an entry."""
|
"""Set up Georide tracker based off an entry."""
|
||||||
|
|
||||||
|
# @callback
|
||||||
|
# def _receive_data(dev_id, **data):
|
||||||
|
# """Receive set location."""
|
||||||
|
# _LOGGER.info("Datariceived from parrent")
|
||||||
|
#
|
||||||
|
# entity = hass.data[GEORIDE_DOMAIN]["devices"].get(dev_id)
|
||||||
|
#
|
||||||
|
# if entity is not None:
|
||||||
|
# entity.update_data(data)
|
||||||
|
# return
|
||||||
|
#
|
||||||
|
# entity = GeorideLockSwitchEntity(dev_id, georide_context.async_get_token, data)
|
||||||
|
# hass.data[GEORIDE_DOMAIN]["devices"][dev_id] = entity
|
||||||
|
# async_add_entities([entity])
|
||||||
|
#
|
||||||
|
# hass.data[GEORIDE_DOMAIN]["context"].set_async_see(_receive_data)
|
||||||
|
|
||||||
|
|
||||||
georide_context = hass.data[GEORIDE_DOMAIN]["context"]
|
georide_context = hass.data[GEORIDE_DOMAIN]["context"]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def handle_event(event):
|
|
||||||
"""Receive tracker update."""
|
|
||||||
nonlocal hass
|
|
||||||
_LOGGER.info('event recieve')
|
|
||||||
|
|
||||||
trackers = event.data.get('trackers')
|
|
||||||
|
|
||||||
# for tracker in trackers:
|
|
||||||
# entity = hass.data[GEORIDE_DOMAIN]["devices"].get(tracker.tracker_id)
|
|
||||||
# if entity is not None:
|
|
||||||
# entity.update_data(tracker)
|
|
||||||
# else:
|
|
||||||
# entity = GeorideLockSwitchEntity(tracker.tracker_id, tracker.tracker_name,
|
|
||||||
# georide_context.async_get_token, data=tracker)
|
|
||||||
# async_add_entities([entity])
|
|
||||||
|
|
||||||
#hass.bus.listen(GEORIDE_DOMAIN + '_trackers_update', handle_event)
|
|
||||||
|
|
||||||
if georide_context.async_get_token() is None:
|
if georide_context.async_get_token() is None:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@@ -48,8 +48,8 @@ async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: d
|
|||||||
|
|
||||||
lock_switch_entities = []
|
lock_switch_entities = []
|
||||||
for tracker in trackers:
|
for tracker in trackers:
|
||||||
entity = GeorideLockSwitchEntity(tracker.tracker_id, tracker.tracker_name,
|
entity = GeorideLockSwitchEntity(tracker.tracker_id, georide_context.async_get_token,
|
||||||
georide_context.async_get_token, data=tracker)
|
georide_context.async_get_tracker, data=tracker)
|
||||||
hass.data[GEORIDE_DOMAIN]["devices"][tracker.tracker_id] = entity
|
hass.data[GEORIDE_DOMAIN]["devices"][tracker.tracker_id] = entity
|
||||||
lock_switch_entities.append(entity)
|
lock_switch_entities.append(entity)
|
||||||
|
|
||||||
@@ -62,14 +62,16 @@ async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: d
|
|||||||
class GeorideLockSwitchEntity(SwitchDevice):
|
class GeorideLockSwitchEntity(SwitchDevice):
|
||||||
"""Represent a tracked device."""
|
"""Represent a tracked device."""
|
||||||
|
|
||||||
def __init__(self, tracker_id, name, get_token_callback, data):
|
def __init__(self, tracker_id, get_token_callback, get_tracker_callback, data):
|
||||||
"""Set up Georide entity."""
|
"""Set up Georide entity."""
|
||||||
self._tracker_id = tracker_id
|
self._tracker_id = tracker_id
|
||||||
self._name = name
|
|
||||||
self._data = data or {}
|
self._data = data or {}
|
||||||
self._get_token_callback = get_token_callback
|
self._get_token_callback = get_token_callback
|
||||||
|
self._get_tracker_callback = get_tracker_callback
|
||||||
|
self._name = data.tracker_name
|
||||||
self._is_on = data.is_locked
|
self._is_on = data.is_locked
|
||||||
self.entity_id = ENTITY_ID_FORMAT.format("lock."+str(tracker_id))
|
self.entity_id = ENTITY_ID_FORMAT.format("lock."+str(tracker_id))
|
||||||
|
self._state = {}
|
||||||
|
|
||||||
|
|
||||||
async def async_turn_on(self, **kwargs):
|
async def async_turn_on(self, **kwargs):
|
||||||
@@ -95,6 +97,9 @@ class GeorideLockSwitchEntity(SwitchDevice):
|
|||||||
async def async_update(self):
|
async def async_update(self):
|
||||||
""" update the current tracker"""
|
""" update the current tracker"""
|
||||||
_LOGGER.info('async_update ')
|
_LOGGER.info('async_update ')
|
||||||
|
self._data = self._get_tracker_callback(self._tracker_id)
|
||||||
|
self._name = self._data.tracker_name
|
||||||
|
self._is_on = self._data.is_locked
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
@@ -134,3 +139,17 @@ class GeorideLockSwitchEntity(SwitchDevice):
|
|||||||
"identifiers": {(GEORIDE_DOMAIN, self._tracker_id)},
|
"identifiers": {(GEORIDE_DOMAIN, self._tracker_id)},
|
||||||
"manufacturer": "GeoRide"
|
"manufacturer": "GeoRide"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@property
|
||||||
|
def should_poll(self):
|
||||||
|
"""No polling needed."""
|
||||||
|
return True
|
||||||
|
|
||||||
|
@callback
|
||||||
|
def update_data(self, data):
|
||||||
|
"""Mark the device as seen."""
|
||||||
|
self._data = data
|
||||||
|
self._name = data.tracker_name
|
||||||
|
self._is_on = data.is_locked
|
||||||
|
self.async_write_ha_state()
|
||||||
|
|||||||
Reference in New Issue
Block a user