Skip to content

Add plex server config options to media_player platform #26458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartinHjelmare merged 5 commits into from
Sep 5, 2019
Merged

Add plex server config options to media_player platform #26458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c16adf6
Add server config options to media_player platform
jjlawren Sep 5, 2019
a9a19ee
Unnecessary else
jjlawren Sep 5, 2019
ea8e88b
Default host
jjlawren Sep 5, 2019
5cb3bb8
No need to try for default values
jjlawren Sep 5, 2019
e710f5f
Use const
jjlawren Sep 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions homeassistant/components/plex/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
DOMAIN = "plex"
NAME_FORMAT = "Plex {}"

DEFAULT_HOST = "localhost"
DEFAULT_PORT = 32400
DEFAULT_SSL = False
DEFAULT_VERIFY_SSL = True
Expand Down
19 changes: 18 additions & 1 deletion homeassistant/components/plex/media_player.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
SUPPORT_VOLUME_SET,
)
from homeassistant.const import (
CONF_HOST,
CONF_PORT,
CONF_SSL,
CONF_URL,
CONF_TOKEN,
CONF_VERIFY_SSL,
Expand All @@ -39,6 +42,10 @@
CONF_SHOW_ALL_CONTROLS,
CONF_REMOVE_UNAVAILABLE_CLIENTS,
CONF_CLIENT_REMOVE_INTERVAL,
DEFAULT_HOST,
DEFAULT_PORT,
DEFAULT_SSL,
DEFAULT_VERIFY_SSL,
DOMAIN as PLEX_DOMAIN,
NAME_FORMAT,
PLEX_CONFIG_FILE,
Expand All @@ -52,6 +59,11 @@

PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
{
vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
vol.Optional(CONF_TOKEN): cv.string,
vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
vol.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
vol.Optional(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): cv.boolean,
vol.Optional(CONF_USE_EPISODE_ART, default=False): cv.boolean,
vol.Optional(CONF_SHOW_ALL_CONTROLS, default=False): cv.boolean,
vol.Optional(CONF_REMOVE_UNAVAILABLE_CLIENTS, default=True): cv.boolean,
Expand Down Expand Up @@ -99,7 +111,12 @@ def setup_platform(hass, config, add_entities_callback, discovery_info=None):
has_ssl = False
verify_ssl = True
else:
return
host = config[CONF_HOST]
port = config[CONF_PORT]
host = f"{host}:{port}"
token = config.get(CONF_TOKEN)
has_ssl = config[CONF_SSL]
verify_ssl = config[CONF_VERIFY_SSL]

setup_plexserver(
host, token, has_ssl, verify_ssl, hass, config, add_entities_callback
Expand Down
3 changes: 1 addition & 2 deletions homeassistant/components/plex/sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
from homeassistant.util import Throttle
import homeassistant.helpers.config_validation as cv

from .const import DEFAULT_PORT, DEFAULT_SSL, DEFAULT_VERIFY_SSL
from .const import DEFAULT_HOST, DEFAULT_PORT, DEFAULT_SSL, DEFAULT_VERIFY_SSL
from .server import PlexServer

DEFAULT_HOST = "localhost"
DEFAULT_NAME = "Plex"
_LOGGER = logging.getLogger(__name__)

Expand Down