evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes an issue with OpenUV config import failing (#17831)

Browse source 
* Fixes an issue with OpenUV config import failing

* Update

* Update __init__.py

* Update config_flow.py
This commit is contained in:
Aaron Bach 2018-10-27 11:07:08 -06:00 • committed by Paulus Schoutsen
parent ea75e3bfa8
commit edf2974979
2 changed files with 34 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
homeassistant/components/openuv/__init__.py
View file

@ -109,26 +109,30 @@ async def async_setup(hass, config):
return True return True
conf = config[DOMAIN] conf = config[DOMAIN]
latitude = conf.get(CONF_LATITUDE)
longitude = conf.get(CONF_LONGITUDE)
identifier = '{0}, {1}'.format(latitude, longitude) identifier = '{0}, {1}'.format(
conf.get(CONF_LATITUDE, hass.config.latitude),
conf.get(CONF_LONGITUDE, hass.config.longitude))
if identifier in configured_instances(hass): if identifier in configured_instances(hass):
return True return True
data = {
CONF_API_KEY: conf[CONF_API_KEY],
CONF_BINARY_SENSORS: conf[CONF_BINARY_SENSORS],
CONF_SENSORS: conf[CONF_SENSORS],
CONF_SCAN_INTERVAL: conf[CONF_SCAN_INTERVAL],
}
if CONF_LATITUDE in conf:
data[CONF_LATITUDE] = conf[CONF_LATITUDE]
if CONF_LONGITUDE in conf:
data[CONF_LONGITUDE] = conf[CONF_LONGITUDE]
if CONF_ELEVATION in conf:
data[CONF_ELEVATION] = conf[CONF_ELEVATION]
hass.async_create_task( hass.async_create_task(
hass.config_entries.flow.async_init( hass.config_entries.flow.async_init(
DOMAIN, DOMAIN, context={'source': SOURCE_IMPORT}, data=data))
context={'source': SOURCE_IMPORT},
data={
CONF_API_KEY: conf[CONF_API_KEY],
CONF_LATITUDE: latitude,
CONF_LONGITUDE: longitude,
CONF_ELEVATION: conf.get(CONF_ELEVATION),
CONF_BINARY_SENSORS: conf[CONF_BINARY_SENSORS],
CONF_SENSORS: conf[CONF_SENSORS],
CONF_SCAN_INTERVAL: conf[CONF_SCAN_INTERVAL],
}))
return True return True
@ -143,10 +147,11 @@ async def async_setup_entry(hass, config_entry):
openuv = OpenUV( openuv = OpenUV(
Client( Client(
config_entry.data[CONF_API_KEY], config_entry.data[CONF_API_KEY],
config_entry.data[CONF_LATITUDE], config_entry.data.get(CONF_LATITUDE, hass.config.latitude),
config_entry.data[CONF_LONGITUDE], config_entry.data.get(CONF_LONGITUDE, hass.config.longitude),
websession, websession,
altitude=config_entry.data[CONF_ELEVATION]), altitude=config_entry.data.get(
CONF_ELEVATION, hass.config.elevation)),
config_entry.data.get(CONF_BINARY_SENSORS, {}).get( config_entry.data.get(CONF_BINARY_SENSORS, {}).get(
CONF_MONITORED_CONDITIONS, list(BINARY_SENSORS)), CONF_MONITORED_CONDITIONS, list(BINARY_SENSORS)),
config_entry.data.get(CONF_SENSORS, {}).get( config_entry.data.get(CONF_SENSORS, {}).get(
@ -158,8 +163,9 @@ async def async_setup_entry(hass, config_entry):
raise ConfigEntryNotReady raise ConfigEntryNotReady
for component in ('binary_sensor', 'sensor'): for component in ('binary_sensor', 'sensor'):
hass.async_create_task(hass.config_entries.async_forward_entry_setup( hass.async_create_task(
config_entry, component)) hass.config_entries.async_forward_entry_setup(
config_entry, component))
async def refresh(event_time): async def refresh(event_time):
"""Refresh OpenUV data.""" """Refresh OpenUV data."""

27
homeassistant/components/openuv/config_flow.py
View file

@ -17,7 +17,8 @@ def configured_instances(hass):
"""Return a set of configured OpenUV instances.""" """Return a set of configured OpenUV instances."""
return set( return set(
'{0}, {1}'.format( '{0}, {1}'.format(
entry.data[CONF_LATITUDE], entry.data[CONF_LONGITUDE]) entry.data.get(CONF_LATITUDE, hass.config.latitude),
entry.data.get(CONF_LONGITUDE, hass.config.longitude))
for entry in hass.config_entries.async_entries(DOMAIN)) for entry in hass.config_entries.async_entries(DOMAIN))
@ -36,12 +37,9 @@ class OpenUvFlowHandler(config_entries.ConfigFlow):
"""Show the form to the user.""" """Show the form to the user."""
data_schema = vol.Schema({ data_schema = vol.Schema({
vol.Required(CONF_API_KEY): str, vol.Required(CONF_API_KEY): str,
vol.Optional(CONF_LATITUDE, default=self.hass.config.latitude): vol.Optional(CONF_LATITUDE): cv.latitude,
cv.latitude, vol.Optional(CONF_LONGITUDE): cv.longitude,
vol.Optional(CONF_LONGITUDE, default=self.hass.config.longitude): vol.Optional(CONF_ELEVATION): vol.Coerce(float),
cv.longitude,
vol.Optional(CONF_ELEVATION, default=self.hass.config.elevation):
vol.Coerce(float),
}) })
return self.async_show_form( return self.async_show_form(
@ -61,11 +59,9 @@ class OpenUvFlowHandler(config_entries.ConfigFlow):
if not user_input: if not user_input:
return await self._show_form() return await self._show_form()
latitude = user_input[CONF_LATITUDE] identifier = '{0}, {1}'.format(
longitude = user_input[CONF_LONGITUDE] user_input.get(CONF_LATITUDE, self.hass.config.latitude),
elevation = user_input[CONF_ELEVATION] user_input.get(CONF_LONGITUDE, self.hass.config.longitude))
identifier = '{0}, {1}'.format(latitude, longitude)
if identifier in configured_instances(self.hass): if identifier in configured_instances(self.hass):
return await self._show_form({CONF_LATITUDE: 'identifier_exists'}) return await self._show_form({CONF_LATITUDE: 'identifier_exists'})
@ -78,11 +74,6 @@ class OpenUvFlowHandler(config_entries.ConfigFlow):
scan_interval = user_input.get( scan_interval = user_input.get(
CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL) CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL)
user_input.update({ user_input[CONF_SCAN_INTERVAL] = scan_interval.seconds
CONF_LATITUDE: latitude,
CONF_LONGITUDE: longitude,
CONF_ELEVATION: elevation,
CONF_SCAN_INTERVAL: scan_interval.seconds,
})
return self.async_create_entry(title=identifier, data=user_input) return self.async_create_entry(title=identifier, data=user_input)