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

Add traccar monitored_conditions option (#21149)

Browse Source 
* Add traccar monitored_conditions option

User defined additional parameters to track from the traccar platform

* Version bump for pytraccar client

* Update traccar.py

* Remove default value

* Update homeassistant/components/device_tracker/traccar.py

Co-Authored-By: lapy <lapy@users.noreply.github.com>

* Update traccar.py
This commit is contained in:
lapy 2019-02-17 22:38:04 +00:00 committed by Martin Hjelmare
parent 72ef9670e6
commit 425b9851fc
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
homeassistant/components/device_tracker/traccar.py
View File

@ -13,14 +13,14 @@ from homeassistant.components.device_tracker import PLATFORM_SCHEMA
from homeassistant.const import ( from homeassistant.const import (
CONF_HOST, CONF_PORT, CONF_SSL, CONF_VERIFY_SSL, CONF_HOST, CONF_PORT, CONF_SSL, CONF_VERIFY_SSL,
CONF_PASSWORD, CONF_USERNAME, ATTR_BATTERY_LEVEL, CONF_PASSWORD, CONF_USERNAME, ATTR_BATTERY_LEVEL,
CONF_SCAN_INTERVAL) CONF_SCAN_INTERVAL, CONF_MONITORED_CONDITIONS)
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.aiohttp_client import async_get_clientsession
from homeassistant.helpers.event import async_track_time_interval from homeassistant.helpers.event import async_track_time_interval
from homeassistant.util import slugify from homeassistant.util import slugify
REQUIREMENTS = ['pytraccar==0.2.1'] REQUIREMENTS = ['pytraccar==0.3.0']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -41,6 +41,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_PORT, default=8082): cv.port, vol.Optional(CONF_PORT, default=8082): cv.port,
vol.Optional(CONF_SSL, default=False): cv.boolean, vol.Optional(CONF_SSL, default=False): cv.boolean,
vol.Optional(CONF_VERIFY_SSL, default=True): cv.boolean, vol.Optional(CONF_VERIFY_SSL, default=True): cv.boolean,
vol.Optional(CONF_MONITORED_CONDITIONS,
default=[]): vol.All(cv.ensure_list, [cv.string]),
}) })
@ -52,16 +54,21 @@ async def async_setup_scanner(hass, config, async_see, discovery_info=None):
api = API(hass.loop, session, config[CONF_USERNAME], config[CONF_PASSWORD], api = API(hass.loop, session, config[CONF_USERNAME], config[CONF_PASSWORD],
config[CONF_HOST], config[CONF_PORT], config[CONF_SSL]) config[CONF_HOST], config[CONF_PORT], config[CONF_SSL])
scanner = TraccarScanner( scanner = TraccarScanner(
api, hass, async_see, config.get(CONF_SCAN_INTERVAL, SCAN_INTERVAL)) api, hass, async_see,
config.get(CONF_SCAN_INTERVAL, SCAN_INTERVAL),
config[CONF_MONITORED_CONDITIONS])
return await scanner.async_init() return await scanner.async_init()
class TraccarScanner: class TraccarScanner:
"""Define an object to retrieve Traccar data.""" """Define an object to retrieve Traccar data."""
def __init__(self, api, hass, async_see, scan_interval): def __init__(self, api, hass, async_see, scan_interval, custom_attributes):
"""Initialize.""" """Initialize."""
self._custom_attributes = custom_attributes
self._scan_interval = scan_interval self._scan_interval = scan_interval
self._async_see = async_see self._async_see = async_see
self._api = api self._api = api
@ -81,7 +88,7 @@ class TraccarScanner:
async def _async_update(self, now=None): async def _async_update(self, now=None):
"""Update info from Traccar.""" """Update info from Traccar."""
_LOGGER.debug('Updating device data.') _LOGGER.debug('Updating device data.')
await self._api.get_device_info() await self._api.get_device_info(self._custom_attributes)
for devicename in self._api.device_info: for devicename in self._api.device_info:
device = self._api.device_info[devicename] device = self._api.device_info[devicename]
attr = {} attr = {}
@ -98,6 +105,9 @@ class TraccarScanner:
attr[ATTR_BATTERY_LEVEL] = device['battery'] attr[ATTR_BATTERY_LEVEL] = device['battery']
if device.get('motion') is not None: if device.get('motion') is not None:
attr[ATTR_MOTION] = device['motion'] attr[ATTR_MOTION] = device['motion']
for custom_attr in self._custom_attributes:
if device.get(custom_attr) is not None:
attr[custom_attr] = device[custom_attr]
await self._async_see( await self._async_see(
dev_id=slugify(device['device_id']), dev_id=slugify(device['device_id']),
gps=(device.get('latitude'), device.get('longitude')), gps=(device.get('latitude'), device.get('longitude')),

2
requirements_all.txt
View File

@ -1403,7 +1403,7 @@ pytile==2.0.5
pytouchline==0.7 pytouchline==0.7
# homeassistant.components.device_tracker.traccar # homeassistant.components.device_tracker.traccar
pytraccar==0.2.1 pytraccar==0.3.0
# homeassistant.components.device_tracker.trackr # homeassistant.components.device_tracker.trackr
pytrackr==0.0.5 pytrackr==0.0.5