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

Fix MercedesMe - add check for unsupported features (#12342)

Browse Source 
* Add check for unsupported features

* Lint fix

* change to guard clause
This commit is contained in:
Rene Nulsch 2018-02-13 06:07:20 +01:00 committed by Paulus Schoutsen
parent 66d14da5e9
commit 00ff305bd7
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
homeassistant/components/binary_sensor/mercedesme.py
View File

@ -9,7 +9,7 @@ import datetime
from homeassistant.components.binary_sensor import (BinarySensorDevice) from homeassistant.components.binary_sensor import (BinarySensorDevice)
from homeassistant.components.mercedesme import ( from homeassistant.components.mercedesme import (
DATA_MME, MercedesMeEntity, BINARY_SENSORS) DATA_MME, FEATURE_NOT_AVAILABLE, MercedesMeEntity, BINARY_SENSORS)
DEPENDENCIES = ['mercedesme'] DEPENDENCIES = ['mercedesme']
@ -27,8 +27,11 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
devices = [] devices = []
for car in data.cars: for car in data.cars:
for key, value in sorted(BINARY_SENSORS.items()): for key, value in sorted(BINARY_SENSORS.items()):
devices.append(MercedesMEBinarySensor( if car['availabilities'].get(key, 'INVALID') == 'VALID':
data, key, value[0], car["vin"], None)) devices.append(MercedesMEBinarySensor(
data, key, value[0], car["vin"], None))
else:
_LOGGER.warning(FEATURE_NOT_AVAILABLE, key, car["license"])
add_devices(devices, True) add_devices(devices, True)

7
homeassistant/components/device_tracker/mercedesme.py
View File

@ -49,10 +49,13 @@ class MercedesMEDeviceTracker(object):
def update_info(self, now=None): def update_info(self, now=None):
"""Update the device info.""" """Update the device info."""
for device in self.data.cars: for device in self.data.cars:
_LOGGER.debug("Updating %s", device["vin"]) if not device['services'].get('VEHICLE_FINDER', False):
continue
location = self.data.get_location(device["vin"]) location = self.data.get_location(device["vin"])
if location is None: if location is None:
return False continue
dev_id = device["vin"] dev_id = device["vin"]
name = device["license"] name = device["license"]

2
homeassistant/components/mercedesme.py
View File

@ -41,6 +41,8 @@ SENSORS = {
DATA_MME = 'mercedesme' DATA_MME = 'mercedesme'
DOMAIN = 'mercedesme' DOMAIN = 'mercedesme'
FEATURE_NOT_AVAILABLE = "The feature %s is not available for your car %s"
NOTIFICATION_ID = 'mercedesme_integration_notification' NOTIFICATION_ID = 'mercedesme_integration_notification'
NOTIFICATION_TITLE = 'Mercedes me integration setup' NOTIFICATION_TITLE = 'Mercedes me integration setup'

10
homeassistant/components/sensor/mercedesme.py
View File

@ -8,7 +8,7 @@ import logging
import datetime import datetime
from homeassistant.components.mercedesme import ( from homeassistant.components.mercedesme import (
DATA_MME, MercedesMeEntity, SENSORS) DATA_MME, FEATURE_NOT_AVAILABLE, MercedesMeEntity, SENSORS)
DEPENDENCIES = ['mercedesme'] DEPENDENCIES = ['mercedesme']
@ -29,8 +29,12 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
devices = [] devices = []
for car in data.cars: for car in data.cars:
for key, value in sorted(SENSORS.items()): for key, value in sorted(SENSORS.items()):
devices.append( if car['availabilities'].get(key, 'INVALID') == 'VALID':
MercedesMESensor(data, key, value[0], car["vin"], value[1])) devices.append(
MercedesMESensor(
data, key, value[0], car["vin"], value[1]))
else:
_LOGGER.warning(FEATURE_NOT_AVAILABLE, key, car["license"])
add_devices(devices, True) add_devices(devices, True)