Compare commits
10 Commits
0.9.0-snap
...
0.9.0-snap
| Author | SHA1 | Date | |
|---|---|---|---|
| f36a3093bf | |||
| 73d15f8c9a | |||
| d326726138 | |||
| 3000d5588b | |||
| a3c84c63fd | |||
| a37cca7902 | |||
| 32db0ec42e | |||
| 1250dda047 | |||
| 759fe2d257 | |||
| 9e2e6e8d53 |
@@ -32,7 +32,7 @@ from homeassistant.helpers.update_coordinator import (
|
||||
)
|
||||
|
||||
|
||||
from .device import Device
|
||||
from .device import Device, DeviceBeacon
|
||||
from .const import (
|
||||
CONF_EMAIL,
|
||||
CONF_PASSWORD,
|
||||
@@ -220,12 +220,13 @@ class GeoRideContext:
|
||||
return tracker_beacon
|
||||
return {}
|
||||
|
||||
async def get_tracker_beacon_by_tracker_id(self, tracker_id):
|
||||
async def get_tracker_beacons_by_tracker_id(self, tracker_id):
|
||||
""" here we return last tracker_beacon by id"""
|
||||
filtered_beacon = []
|
||||
for tracker_beacon in self._georide_trackers_beacon:
|
||||
if tracker_beacon.linked_tracker_id == tracker_id:
|
||||
return tracker_beacon
|
||||
return {}
|
||||
filtered_beacon.append(tracker_beacon)
|
||||
return filtered_beacon
|
||||
|
||||
async def refresh_trackers(self):
|
||||
""" here we return last tracker by id"""
|
||||
@@ -255,8 +256,7 @@ class GeoRideContext:
|
||||
if not found:
|
||||
self._georide_trackers.append(refreshed_tracker)
|
||||
if refreshed_tracker.version > 2:
|
||||
await self.force_refresh_trackers_beacon(tracker.tracker_id)
|
||||
|
||||
await self.force_refresh_trackers_beacon(refreshed_tracker.tracker_id)
|
||||
if not self._thread_started:
|
||||
_LOGGER.info("Start the thread")
|
||||
# We refresh the tracker list each hours
|
||||
@@ -266,15 +266,16 @@ class GeoRideContext:
|
||||
async def force_refresh_trackers_beacon(self, tracker_id):
|
||||
"""Used to refresh the tracker list"""
|
||||
_LOGGER.info("Tracker beacon refresh")
|
||||
new_georide_tracker_beacon = await self._hass.async_add_executor_job(GeoRideApi.get_tracker_beacon,
|
||||
new_georide_tracker_beacons = await self._hass.async_add_executor_job(GeoRideApi.get_tracker_beacons,
|
||||
await self.get_token(), tracker_id)
|
||||
found = False
|
||||
for tracker_beacon in self._georide_trackers_beacon:
|
||||
if tracker_beacon.tracker_id == new_georide_tracker_beacon.beacon_id:
|
||||
tracker_beacon.update_all_data(new_georide_tracker_beacon)
|
||||
found = True
|
||||
if not found:
|
||||
self._georide_trackers_beacon.append(new_georide_tracker_beacon)
|
||||
for new_georide_tracker_beacon in new_georide_tracker_beacons:
|
||||
found = False
|
||||
for tracker_beacon in self._georide_trackers_beacon:
|
||||
if tracker_beacon.tracker_id == new_georide_tracker_beacon.beacon_id:
|
||||
tracker_beacon.update_all_data(new_georide_tracker_beacon)
|
||||
found = True
|
||||
if not found:
|
||||
self._georide_trackers_beacon.append(new_georide_tracker_beacon)
|
||||
if not self._thread_started:
|
||||
_LOGGER.info("Start the thread")
|
||||
# We refresh the tracker list each hours
|
||||
@@ -301,17 +302,18 @@ class GeoRideContext:
|
||||
"coordinator": coordinator
|
||||
}
|
||||
if tracker.version > 2:
|
||||
tracker_beacon = await get_tracker_beacon_by_tracker_id(tracker.tracker_id)
|
||||
beacon_coordinator = DataUpdateCoordinator[Mapping[str, Any]](
|
||||
hass,
|
||||
_LOGGER,
|
||||
name=tracker_beacon.name
|
||||
)
|
||||
coordoned_beacon = {
|
||||
"beacon_device": DeviceBeacon(tracker_beacon),
|
||||
"coordinator": coordinator
|
||||
}
|
||||
self._georide_trackers_beacon_coordoned(coordoned_beacon)
|
||||
tracker_beacons = await self.get_tracker_beacons_by_tracker_id(tracker.tracker_id)
|
||||
for tracker_beacon in tracker_beacons:
|
||||
beacon_coordinator = DataUpdateCoordinator[Mapping[str, Any]](
|
||||
hass,
|
||||
_LOGGER,
|
||||
name= tracker_beacon.name
|
||||
)
|
||||
coordoned_beacon = {
|
||||
"beacon_device": DeviceBeacon(tracker_beacon),
|
||||
"coordinator": coordinator
|
||||
}
|
||||
self._georide_trackers_beacon_coordoned.append(coordoned_beacon)
|
||||
self._georide_trackers_coordoned.append(coordoned_tracker)
|
||||
|
||||
|
||||
|
||||
@@ -142,7 +142,7 @@ class GeoRideCrashedBinarySensorEntity(GeoRideBinarySensorEntity):
|
||||
@property
|
||||
def name(self):
|
||||
""" GeoRide odometer name """
|
||||
return f"{self._name} is crashed"
|
||||
return f"{self._name} is not crashed"
|
||||
|
||||
class GeoRideActiveSubscriptionBinarySensorEntity(GeoRideBinarySensorEntity):
|
||||
"""Represent a tracked device."""
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
"issue_tracker": "https://github.com/ptimatth/GeorideHA/issues",
|
||||
"iot_class": "cloud_polling",
|
||||
"requirements": [
|
||||
"georideapilib==0.8.1",
|
||||
"georideapilib>=0.8.2",
|
||||
"pyjwt==2.1.0"
|
||||
],
|
||||
"dependencies": [],
|
||||
|
||||
@@ -108,7 +108,6 @@ class GeoRideOdometerKmSensorEntity(CoordinatorEntity, SensorEntity):
|
||||
self._name = tracker_device.tracker.tracker_name
|
||||
self._unit_of_measurement = "km"
|
||||
self.entity_id = f"{ENTITY_ID_FORMAT.format('odometer_km')}.{tracker_device.tracker.tracker_id}"# pylint: disable=C0301
|
||||
|
||||
self._state = 0
|
||||
self._hass = hass
|
||||
|
||||
|
||||
Reference in New Issue
Block a user