Skip to content

Bugfix: 10509 - http is hard coded in plex sensor #11072

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
emlove merged 14 commits into from
Dec 21, 2017
Merged

Bugfix: 10509 - http is hard coded in plex sensor #11072

Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fcd92f6
Fix for sensor no ssl
ryanm101 Nov 13, 2017
00f468d
Line length Fixes
ryanm101 Dec 10, 2017
032c527
Removed unneeded schema extensions
ryanm101 Dec 10, 2017
19f1d85
Removed unrequired variable
ryanm101 Dec 11, 2017
17bbe0e
Added defaults for SSL & SSL Verify
ryanm101 Dec 14, 2017
1905579
Moved Defaults to Variables
ryanm101 Dec 14, 2017
3c1ffb6
Fixed Typo
ryanm101 Dec 14, 2017
2cfa728
Removed option to disable verify ssl
ryanm101 Dec 18, 2017
0a4e08e
Merge branch 'clean_plex_uri_fix' of github.com:ryanm101/home-assista…
ryanm101 Dec 18, 2017
92bfd05
Removed unused import
ryanm101 Dec 18, 2017
f6bbf2c
Removed unused CONST
ryanm101 Dec 18, 2017
c28ac78
Fixed error handling
ryanm101 Dec 18, 2017
bf87edb
Cleanup of unneeded vars & logging
ryanm101 Dec 18, 2017
11079a2
Fix for linting
ryanm101 Dec 18, 2017
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
36 changes: 26 additions & 10 deletions homeassistant/components/sensor/plex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@

from homeassistant.components.switch import PLATFORM_SCHEMA
from homeassistant.const import (
CONF_NAME, CONF_USERNAME, CONF_PASSWORD, CONF_HOST, CONF_PORT, CONF_TOKEN)
CONF_NAME, CONF_USERNAME, CONF_PASSWORD, CONF_HOST, CONF_PORT, CONF_TOKEN,
CONF_SSL)
from homeassistant.helpers.entity import Entity
from homeassistant.util import Throttle
import homeassistant.helpers.config_validation as cv
Expand All @@ -24,6 +25,7 @@
DEFAULT_HOST = 'localhost'
DEFAULT_NAME = 'Plex'
DEFAULT_PORT = 32400
DEFAULT_SSL = False

MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=1)

Expand All @@ -35,6 +37,7 @@
vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
vol.Optional(CONF_SERVER): cv.string,
vol.Optional(CONF_USERNAME): cv.string,
vol.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
})


Expand All @@ -48,7 +51,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
plex_host = config.get(CONF_HOST)
plex_port = config.get(CONF_PORT)
plex_token = config.get(CONF_TOKEN)
plex_url = 'http://{}:{}'.format(plex_host, plex_port)

plex_url = '{}://{}:{}'.format('https' if config.get(CONF_SSL) else 'http',
plex_host, plex_port)

add_devices([PlexSensor(
name, plex_url, plex_user, plex_password, plex_server,
Expand All @@ -63,19 +68,30 @@ def __init__(self, name, plex_url, plex_user, plex_password,
"""Initialize the sensor."""
from plexapi.myplex import MyPlexAccount
from plexapi.server import PlexServer
import plexapi.exceptions

cert_session = None

@emlove emlove Dec 18, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this is always None. Can this be dropped?


self._name = name
self._state = 0
self._now_playing = []

if plex_token:
self._server = PlexServer(plex_url, plex_token)
elif plex_user and plex_password:
user = MyPlexAccount(plex_user, plex_password)
server = plex_server if plex_server else user.resources()[0].name
self._server = user.resource(server).connect()
else:
self._server = PlexServer(plex_url)
try:
if plex_token:
self._server = PlexServer(plex_url, plex_token, cert_session)
elif plex_user and plex_password:
user = MyPlexAccount(plex_user, plex_password)
server = plex_server if plex_server \
else user.resources()[0].name
self._server = user.resource(server).connect()
else:
self._server = PlexServer(plex_url)

_LOGGER.info("Plex Sensor Configuration done")
except (plexapi.exceptions.BadRequest, plexapi.exceptions.Unauthorized,

@emlove emlove Dec 18, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move this try/except to surround the add_devices line in setup platform. Ignoring the exception here means we're creating the entity without a valid self._server, which the rest of the code doesn't handle.

@ryanm101 ryanm101 Dec 18, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

plexapi.exceptions.NotFound) as error:
_LOGGER.info(error)

@emlove emlove Dec 18, 2017 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we can't recover from this exception this should be an error level log.

@ryanm101 ryanm101 Dec 18, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

return

@property
def name(self):
Expand Down