mduval/GeoRideHA
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move all external call to asyn/await

Browse Source
This commit is contained in:
Matthieu DUVAL
2021-04-10 11:58:58 +02:00
parent 3c6f39f7ba
commit 1e21de655f
5 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
custom_components/georide/__init__.py
View File

@@ -111,7 +111,7 @@ async def async_unload_entry(hass, entry):
return True return True
def connect_socket(context): async def connect_socket(context):
"""subscribe to GeoRide socket""" """subscribe to GeoRide socket"""
_LOGGER.info("GeoRide socket connexion") _LOGGER.info("GeoRide socket connexion")
socket = GeoRideSocket() socket = GeoRideSocket()
@@ -123,7 +123,7 @@ def connect_socket(context):
context.socket = socket context.socket = socket
socket.init() socket.init()
socket.connect(context.get_token()) socket.connect(await context.get_token())
class GeoRideContext: class GeoRideContext:
@@ -169,7 +169,7 @@ class GeoRideContext:
""" GeoRide tracker list """ """ GeoRide tracker list """
self._georide_trackers = trackers self._georide_trackers = trackers
def get_token(self): async def get_token(self):
""" here we return the current valid tocken """ """ here we return the current valid tocken """
jwt_data = jwt.decode(self._token, verify=False) jwt_data = jwt.decode(self._token, verify=False)
exp_timestamp = jwt_data['exp'] exp_timestamp = jwt_data['exp']

14
custom_components/georide/binary_sensor.py
View File

@@ -15,11 +15,11 @@ _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."""
georide_context = hass.data[GEORIDE_DOMAIN]["context"] georide_context = hass.data[GEORIDE_DOMAIN]["context"]
token = await georide_context.get_token()
if georide_context.get_token() is None: if token is None:
return False return False
trackers = GeoRideApi.get_trackers(georide_context.get_token()) trackers = GeoRideApi.get_trackers(token)
binary_sensor_entities = [] binary_sensor_entities = []
for tracker in trackers: for tracker in trackers:
@@ -50,10 +50,10 @@ class GeoRideStolenBinarySensorEntity(BinarySensorEntity):
self._state = 0 self._state = 0
def update(self): async def async_update(self):
""" update the current tracker""" """ update the current tracker"""
_LOGGER.info('update') _LOGGER.info('update')
self._data = self._get_tracker_callback(self._tracker_id) self._data = await self._get_tracker_callback(self._tracker_id)
self._name = self._data.tracker_name self._name = self._data.tracker_name
self._state = self._data.is_stolen self._state = self._data.is_stolen
@@ -107,10 +107,10 @@ class GeoRideCrashedBinarySensorEntity(BinarySensorEntity):
self._state = 0 self._state = 0
def update(self): async def async_update(self):
""" update the current tracker""" """ update the current tracker"""
_LOGGER.info('update') _LOGGER.info('update')
self._data = self._get_tracker_callback(self._tracker_id) self._data = await self._get_tracker_callback(self._tracker_id)
self._name = self._data.tracker_name self._name = self._data.tracker_name
self._state = self._data.is_crashed self._state = self._data.is_crashed

12
custom_components/georide/device_tracker.py
View File

@@ -16,14 +16,14 @@ async def async_setup_entry(hass, config_entry, async_add_entities): # pylint: d
"""Set up Georide tracker based off an entry.""" """Set up Georide tracker based off an entry."""
georide_context = hass.data[GEORIDE_DOMAIN]["context"] georide_context = hass.data[GEORIDE_DOMAIN]["context"]
token = await georide_context.get_token()
if georide_context.get_token() is None: if token is None:
return False return False
_LOGGER.debug('Current GeoRide token: %s', georide_context.get_token()) _LOGGER.debug('Current GeoRide token: %s', token)
trackers = GeoRideApi.get_trackers(georide_context.get_token()) trackers = GeoRideApi.get_trackers(token)
tracker_entities = [] tracker_entities = []
@@ -118,9 +118,9 @@ class GeoRideTrackerEntity(TrackerEntity):
"""No polling needed.""" """No polling needed."""
return True return True
def update(self): async def async_update(self):
""" update the current tracker""" """ update the current tracker"""
_LOGGER.info('update') _LOGGER.info('update')
self._data = self._get_tracker_callback(self._tracker_id) self._data = await self._get_tracker_callback(self._tracker_id)
self._name = self._data.tracker_name self._name = self._data.tracker_name

10
custom_components/georide/sensor.py
View File

@@ -17,11 +17,11 @@ _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."""
georide_context = hass.data[GEORIDE_DOMAIN]["context"] georide_context = hass.data[GEORIDE_DOMAIN]["context"]
token = await georide_context.get_token()
if georide_context.get_token() is None: if token is None:
return False return False
trackers = GeoRideApi.get_trackers(georide_context.get_token()) trackers = GeoRideApi.get_trackers(token)
odometer_switch_entities = [] odometer_switch_entities = []
for tracker in trackers: for tracker in trackers:
@@ -50,10 +50,10 @@ class GeoRideOdometerSensorEntity(SwitchEntity):
self._state = 0 self._state = 0
def update(self): async def async_update(self):
""" update the current tracker""" """ update the current tracker"""
_LOGGER.info('update') _LOGGER.info('update')
self._data = self._get_tracker_callback(self._tracker_id) self._data = await self._get_tracker_callback(self._tracker_id)
self._name = self._data.tracker_name self._name = self._data.tracker_name
self._state = self._data.odometer self._state = self._data.odometer

18
custom_components/georide/switch.py
View File

@@ -17,13 +17,13 @@ _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."""
georide_context = hass.data[GEORIDE_DOMAIN]["context"] georide_context = hass.data[GEORIDE_DOMAIN]["context"]
token = await georide_context.get_token()
if georide_context.get_token() is None: if token is None:
return False return False
_LOGGER.info('Current georide token: %s', georide_context.get_token()) _LOGGER.info('Current georide token: %s', token)
trackers = GeoRideApi.get_trackers(georide_context.get_token()) trackers = await GeoRideApi.get_trackers(token)
lock_switch_entities = [] lock_switch_entities = []
for tracker in trackers: for tracker in trackers:
@@ -56,7 +56,7 @@ class GeoRideLockSwitchEntity(SwitchEntity):
def turn_on(self, **kwargs): def turn_on(self, **kwargs):
""" lock the GeoRide tracker """ """ lock the GeoRide tracker """
_LOGGER.info('async_turn_on %s', kwargs) _LOGGER.info('async_turn_on %s', kwargs)
success = GeoRideApi.lock_tracker(self._get_token_callback(), self._tracker_id) success = GeoRideApi.lock_tracker(await self._get_token_callback(), self._tracker_id)
if success: if success:
self._data.is_locked = True self._data.is_locked = True
self._is_on = True self._is_on = True
@@ -64,7 +64,7 @@ class GeoRideLockSwitchEntity(SwitchEntity):
def turn_off(self, **kwargs): def turn_off(self, **kwargs):
""" unlock the GeoRide tracker """ """ unlock the GeoRide tracker """
_LOGGER.info('async_turn_off %s', kwargs) _LOGGER.info('async_turn_off %s', kwargs)
success = GeoRideApi.unlock_tracker(self._get_token_callback(), self._tracker_id) success = GeoRideApi.unlock_tracker(await self._get_token_callback(), self._tracker_id)
if success: if success:
self._data.is_locked = False self._data.is_locked = False
self._is_on = False self._is_on = False
@@ -72,16 +72,16 @@ class GeoRideLockSwitchEntity(SwitchEntity):
async def async_toggle(self, **kwargs): async def async_toggle(self, **kwargs):
""" toggle lock the georide tracker """ """ toggle lock the georide tracker """
_LOGGER.info('async_toggle %s', kwargs) _LOGGER.info('async_toggle %s', kwargs)
result = GeoRideApi.toogle_lock_tracker(self._get_token_callback(), result = await GeoRideApi.toogle_lock_tracker(await self._get_token_callback(),
self._tracker_id) self._tracker_id)
self._data.is_locked = result self._data.is_locked = result
self._is_on = result self._is_on = result
def update(self): async def async_update(self):
""" update the current tracker""" """ update the current tracker"""
_LOGGER.info('update') _LOGGER.info('update')
self._data = self._get_tracker_callback(self._tracker_id) self._data = await self._get_tracker_callback(self._tracker_id)
self._name = self._data.tracker_name self._name = self._data.tracker_name
self._is_on = self._data.is_locked self._is_on = self._data.is_locked