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

Add manual step to Plex config flow (#26773)

Browse source 
* Add manual config step

* Pass token to manual step

* Fix for no token

* Show error

* Specify key location

* Cast discovery port to int
This commit is contained in:
jjlawren 2019-09-22 17:23:14 -05:00 • committed by Martin Hjelmare
parent fbe85a2eb2
commit 5914475fe5
3 changed files with 140 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

53
homeassistant/components/plex/config_flow.py
View file

@ -6,13 +6,22 @@ import requests.exceptions
import voluptuous as vol
from homeassistant import config_entries
from homeassistant.const import CONF_URL, CONF_TOKEN, CONF_SSL, CONF_VERIFY_SSL
from homeassistant.const import (
CONF_HOST,
CONF_PORT,
CONF_URL,
CONF_TOKEN,
CONF_SSL,
CONF_VERIFY_SSL,
)
from homeassistant.core import callback
from homeassistant.util.json import load_json
from .const import ( # pylint: disable=unused-import
CONF_SERVER,
CONF_SERVER_IDENTIFIER,
DEFAULT_PORT,
DEFAULT_SSL,
DEFAULT_VERIFY_SSL,
DOMAIN,
PLEX_CONFIG_FILE,
@ -21,7 +30,9 @@ from .const import ( # pylint: disable=unused-import
from .errors import NoServersFound, ServerNotSpecified
from .server import PlexServer
USER_SCHEMA = vol.Schema({vol.Required(CONF_TOKEN): str})
USER_SCHEMA = vol.Schema(
{vol.Optional(CONF_TOKEN): str, vol.Optional("manual_setup"): bool}
)
_LOGGER = logging.getLogger(__package__)
@ -44,14 +55,22 @@ class PlexFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
def __init__(self):
"""Initialize the Plex flow."""
self.current_login = {}
self.discovery_info = {}
self.available_servers = None
async def async_step_user(self, user_input=None):
"""Handle a flow initialized by the user."""
errors = {}
if user_input is not None:
return await self.async_step_server_validate(user_input)
if user_input.pop("manual_setup", False):
return await self.async_step_manual_setup(user_input)
if CONF_TOKEN in user_input:
return await self.async_step_server_validate(user_input)
errors[CONF_TOKEN] = "no_token"
return self.async_show_form(step_id="user", data_schema=USER_SCHEMA, errors={})
return self.async_show_form(
step_id="user", data_schema=USER_SCHEMA, errors=errors
)
async def async_step_server_validate(self, server_config):
"""Validate a provided configuration."""
@ -114,6 +133,30 @@ class PlexFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
},
)
async def async_step_manual_setup(self, user_input=None):
"""Begin manual configuration."""
if len(user_input) > 1:
host = user_input.pop(CONF_HOST)
port = user_input.pop(CONF_PORT)
prefix = "https" if user_input.pop(CONF_SSL) else "http"
user_input[CONF_URL] = f"{prefix}://{host}:{port}"
return await self.async_step_server_validate(user_input)
data_schema = vol.Schema(
{
vol.Required(
CONF_HOST, default=self.discovery_info.get(CONF_HOST)
): str,
vol.Required(
CONF_PORT, default=self.discovery_info.get(CONF_PORT, DEFAULT_PORT)
): int,
vol.Optional(CONF_SSL, default=DEFAULT_SSL): bool,
vol.Optional(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): bool,
vol.Optional(CONF_TOKEN, default=user_input.get(CONF_TOKEN, "")): str,
}
)
return self.async_show_form(step_id="manual_setup", data_schema=data_schema)
async def async_step_select_server(self, user_input=None):
"""Use selected Plex server."""
config = dict(self.current_login)
@ -148,6 +191,8 @@ class PlexFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
# Skip discovery if a config already exists or is in progress.
return self.async_abort(reason="already_configured")
discovery_info[CONF_PORT] = int(discovery_info[CONF_PORT])
self.discovery_info = discovery_info
json_file = self.hass.config.path(PLEX_CONFIG_FILE)
file_config = await self.hass.async_add_executor_job(load_json, json_file)