Logi Circle public API refactor and config flow (#20624)
* Logi Circle now uses OAuth2 for authentication, added config flow. * Service calls now dispatched to camera entities via signalled events * Update from PR review * Add unit tests for config flow * Updated CODEOWNERS * Reverted change to .coveragerc * Improved test coverage of config flow
This commit is contained in:
1 parent
f81ce0b720
commit
a48c0f2991
16 files changed
+822
-210
No files matched your search
@@ -1,51 +1,36 @@
|
||||
"""Support for Logi Circle sensors."""
|
||||
import logging
|
||||
|
||||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.sensor import PLATFORM_SCHEMA
|
||||
from homeassistant.const import (
|
||||
ATTR_ATTRIBUTION, ATTR_BATTERY_CHARGING, CONF_ENTITY_NAMESPACE,
|
||||
CONF_MONITORED_CONDITIONS, STATE_OFF, STATE_ON)
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
ATTR_ATTRIBUTION, ATTR_BATTERY_CHARGING, CONF_MONITORED_CONDITIONS,
|
||||
CONF_SENSORS, STATE_OFF, STATE_ON)
|
||||
from homeassistant.helpers.entity import Entity
|
||||
from homeassistant.helpers.icon import icon_for_battery_level
|
||||
from homeassistant.util.dt import as_local
|
||||
|
||||
from . import (
|
||||
ATTRIBUTION, DEFAULT_ENTITY_NAMESPACE, DOMAIN as LOGI_CIRCLE_DOMAIN)
|
||||
from .const import (
|
||||
ATTRIBUTION, DOMAIN as LOGI_CIRCLE_DOMAIN, LOGI_SENSORS as SENSOR_TYPES)
|
||||
|
||||
DEPENDENCIES = ['logi_circle']
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
# Sensor types: Name, unit of measure, icon per sensor key.
|
||||
SENSOR_TYPES = {
|
||||
'battery_level': ['Battery', '%', 'battery-50'],
|
||||
'last_activity_time': ['Last Activity', None, 'history'],
|
||||
'privacy_mode': ['Privacy Mode', None, 'eye'],
|
||||
'signal_strength_category': ['WiFi Signal Category', None, 'wifi'],
|
||||
'signal_strength_percentage': ['WiFi Signal Strength', '%', 'wifi'],
|
||||
'speaker_volume': ['Volume', '%', 'volume-high'],
|
||||
'streaming_mode': ['Streaming Mode', None, 'camera'],
|
||||
}
|
||||
|
||||
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
|
||||
vol.Optional(CONF_ENTITY_NAMESPACE, default=DEFAULT_ENTITY_NAMESPACE):
|
||||
cv.string,
|
||||
vol.Required(CONF_MONITORED_CONDITIONS, default=list(SENSOR_TYPES)):
|
||||
vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)]),
|
||||
})
|
||||
|
||||
|
||||
async def async_setup_platform(
|
||||
hass, config, async_add_entities, discovery_info=None):
|
||||
"""Set up a sensor for a Logi Circle device."""
|
||||
devices = hass.data[LOGI_CIRCLE_DOMAIN]
|
||||
"""Set up a sensor for a Logi Circle device. Obsolete."""
|
||||
_LOGGER.warning(
|
||||
'Logi Circle no longer works with sensor platform configuration')
|
||||
|
||||
|
||||
async def async_setup_entry(hass, entry, async_add_entities):
|
||||
"""Set up a Logi Circle sensor based on a config entry."""
|
||||
devices = await hass.data[LOGI_CIRCLE_DOMAIN].cameras
|
||||
time_zone = str(hass.config.time_zone)
|
||||
|
||||
sensors = []
|
||||
for sensor_type in config.get(CONF_MONITORED_CONDITIONS):
|
||||
for sensor_type in (entry.data.get(CONF_SENSORS)
|
||||
.get(CONF_MONITORED_CONDITIONS)):
|
||||
for device in devices:
|
||||
if device.supports_feature(sensor_type):
|
||||
sensors.append(LogiSensor(device, time_zone, sensor_type))
|
||||
@@ -64,6 +49,7 @@ class LogiSensor(Entity):
|
||||
self._icon = 'mdi:{}'.format(SENSOR_TYPES.get(self._sensor_type)[2])
|
||||
self._name = "{0} {1}".format(
|
||||
self._camera.name, SENSOR_TYPES.get(self._sensor_type)[0])
|
||||
self._activity = {}
|
||||
self._state = None
|
||||
self._tz = time_zone
|
||||
|
||||
@@ -89,12 +75,11 @@ class LogiSensor(Entity):
|
||||
ATTR_ATTRIBUTION: ATTRIBUTION,
|
||||
'battery_saving_mode': (
|
||||
STATE_ON if self._camera.battery_saving else STATE_OFF),
|
||||
'ip_address': self._camera.ip_address,
|
||||
'microphone_gain': self._camera.microphone_gain
|
||||
}
|
||||
|
||||
if self._sensor_type == 'battery_level':
|
||||
state[ATTR_BATTERY_CHARGING] = self._camera.is_charging
|
||||
state[ATTR_BATTERY_CHARGING] = self._camera.charging
|
||||
|
||||
return state
|
||||
|
||||
@@ -105,9 +90,9 @@ class LogiSensor(Entity):
|
||||
self._state is not None):
|
||||
return icon_for_battery_level(battery_level=int(self._state),
|
||||
charging=False)
|
||||
if (self._sensor_type == 'privacy_mode' and
|
||||
if (self._sensor_type == 'recording_mode' and
|
||||
self._state is not None):
|
||||
return 'mdi:eye-off' if self._state == STATE_ON else 'mdi:eye'
|
||||
return 'mdi:eye' if self._state == STATE_ON else 'mdi:eye-off'
|
||||
if (self._sensor_type == 'streaming_mode' and
|
||||
self._state is not None):
|
||||
return (
|
||||
@@ -125,7 +110,8 @@ class LogiSensor(Entity):
|
||||
await self._camera.update()
|
||||
|
||||
if self._sensor_type == 'last_activity_time':
|
||||
last_activity = await self._camera.last_activity
|
||||
last_activity = (await self._camera.
|
||||
get_last_activity(force_refresh=True))
|
||||
if last_activity is not None:
|
||||
last_activity_time = as_local(last_activity.end_time_utc)
|
||||
self._state = '{0:0>2}:{1:0>2}'.format(
|
||||
@@ -136,3 +122,4 @@ class LogiSensor(Entity):
|
||||
self._state = STATE_ON if state is True else STATE_OFF
|
||||
else:
|
||||
self._state = state
|
||||
self._state = state
|
||||
Reference in new issue
Block a user