From 425b9851fc5afabf289b974b89e211cd7a9d4b29 Mon Sep 17 00:00:00 2001 From: lapy Date: Sun, 17 Feb 2019 22:38:04 +0000 Subject: [PATCH] Add traccar monitored_conditions option (#21149) * 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 * Update traccar.py --- .../components/device_tracker/traccar.py | 20 ++++++++++++++----- requirements_all.txt | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/homeassistant/components/device_tracker/traccar.py b/homeassistant/components/device_tracker/traccar.py index 4d340100849..1447f7c896c 100644 --- a/homeassistant/components/device_tracker/traccar.py +++ b/homeassistant/components/device_tracker/traccar.py @@ -13,14 +13,14 @@ from homeassistant.components.device_tracker import PLATFORM_SCHEMA from homeassistant.const import ( CONF_HOST, CONF_PORT, CONF_SSL, CONF_VERIFY_SSL, CONF_PASSWORD, CONF_USERNAME, ATTR_BATTERY_LEVEL, - CONF_SCAN_INTERVAL) + CONF_SCAN_INTERVAL, CONF_MONITORED_CONDITIONS) import homeassistant.helpers.config_validation as cv from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.event import async_track_time_interval from homeassistant.util import slugify -REQUIREMENTS = ['pytraccar==0.2.1'] +REQUIREMENTS = ['pytraccar==0.3.0'] _LOGGER = logging.getLogger(__name__) @@ -41,6 +41,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ vol.Optional(CONF_PORT, default=8082): cv.port, vol.Optional(CONF_SSL, default=False): 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], config[CONF_HOST], config[CONF_PORT], config[CONF_SSL]) + 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() class TraccarScanner: """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.""" + self._custom_attributes = custom_attributes self._scan_interval = scan_interval self._async_see = async_see self._api = api @@ -81,7 +88,7 @@ class TraccarScanner: async def _async_update(self, now=None): """Update info from Traccar.""" _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: device = self._api.device_info[devicename] attr = {} @@ -98,6 +105,9 @@ class TraccarScanner: attr[ATTR_BATTERY_LEVEL] = device['battery'] if device.get('motion') is not None: 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( dev_id=slugify(device['device_id']), gps=(device.get('latitude'), device.get('longitude')), diff --git a/requirements_all.txt b/requirements_all.txt index 3f7104d0810..61460db5394 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1403,7 +1403,7 @@ pytile==2.0.5 pytouchline==0.7 # homeassistant.components.device_tracker.traccar -pytraccar==0.2.1 +pytraccar==0.3.0 # homeassistant.components.device_tracker.trackr pytrackr==0.0.5