jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-21 04:07:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Plex api update (#11423)

Browse Source 
* Updated plexapi to 3.0.5

* Removed removed server obj that was being used for the media URL generation as .url() is available in self._session
seasons() no longer exists -> renamed to season()
season() returns obj not list so corrected
season.index returns int, cast to str to zerofill

* Fixed Linting
This commit is contained in:
Ryan McLean 2018-01-03 18:28:43 +00:00 committed by Pascal Vizeli
parent bb2191b2b0
commit 36c7fbe06a
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
homeassistant/components/media_player/plex.py
View File

@ -23,7 +23,7 @@ from homeassistant.helpers import config_validation as cv
from homeassistant.helpers.event import track_utc_time_change from homeassistant.helpers.event import track_utc_time_change
from homeassistant.util.json import load_json, save_json from homeassistant.util.json import load_json, save_json
REQUIREMENTS = ['plexapi==3.0.3'] REQUIREMENTS = ['plexapi==3.0.5']
_CONFIGURING = {} _CONFIGURING = {}
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -156,7 +156,7 @@ def setup_plexserver(
if device.machineIdentifier not in plex_clients: if device.machineIdentifier not in plex_clients:
new_client = PlexClient(config, device, None, new_client = PlexClient(config, device, None,
plex_sessions, update_devices, plex_sessions, update_devices,
update_sessions, plexserver) update_sessions)
plex_clients[device.machineIdentifier] = new_client plex_clients[device.machineIdentifier] = new_client
new_plex_clients.append(new_client) new_plex_clients.append(new_client)
else: else:
@ -169,7 +169,7 @@ def setup_plexserver(
and machine_identifier is not None): and machine_identifier is not None):
new_client = PlexClient(config, None, session, new_client = PlexClient(config, None, session,
plex_sessions, update_devices, plex_sessions, update_devices,
update_sessions, plexserver) update_sessions)
plex_clients[machine_identifier] = new_client plex_clients[machine_identifier] = new_client
new_plex_clients.append(new_client) new_plex_clients.append(new_client)
else: else:
@ -249,10 +249,9 @@ class PlexClient(MediaPlayerDevice):
"""Representation of a Plex device.""" """Representation of a Plex device."""
def __init__(self, config, device, session, plex_sessions, def __init__(self, config, device, session, plex_sessions,
update_devices, update_sessions, plex_server): update_devices, update_sessions):
"""Initialize the Plex device.""" """Initialize the Plex device."""
self._app_name = '' self._app_name = ''
self._server = plex_server
self._device = None self._device = None
self._device_protocol_capabilities = None self._device_protocol_capabilities = None
self._is_player_active = False self._is_player_active = False
@ -392,13 +391,12 @@ class PlexClient(MediaPlayerDevice):
thumb_url = self._session.thumbUrl thumb_url = self._session.thumbUrl
if (self.media_content_type is MEDIA_TYPE_TVSHOW if (self.media_content_type is MEDIA_TYPE_TVSHOW
and not self.config.get(CONF_USE_EPISODE_ART)): and not self.config.get(CONF_USE_EPISODE_ART)):
thumb_url = self._server.url( thumb_url = self._session.url(self._session.grandparentThumb)
self._session.grandparentThumb)
if thumb_url is None: if thumb_url is None:
_LOGGER.debug("Using media art because media thumb " _LOGGER.debug("Using media art because media thumb "
"was not found: %s", self.entity_id) "was not found: %s", self.entity_id)
thumb_url = self._server.url(self._session.art) thumb_url = self.session.url(self._session.art)
self._media_image_url = thumb_url self._media_image_url = thumb_url
@ -421,8 +419,9 @@ class PlexClient(MediaPlayerDevice):
self._media_content_type = MEDIA_TYPE_TVSHOW self._media_content_type = MEDIA_TYPE_TVSHOW
# season number (00) # season number (00)
if callable(self._session.seasons): if callable(self._session.season):
self._media_season = self._session.seasons()[0].index.zfill(2) self._media_season = str(
(self._session.season()).index).zfill(2)
elif self._session.parentIndex is not None: elif self._session.parentIndex is not None:
self._media_season = self._session.parentIndex.zfill(2) self._media_season = self._session.parentIndex.zfill(2)
else: else:

2
homeassistant/components/sensor/plex.py
View File

@ -16,7 +16,7 @@ from homeassistant.helpers.entity import Entity
from homeassistant.util import Throttle from homeassistant.util import Throttle
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
REQUIREMENTS = ['plexapi==3.0.3'] REQUIREMENTS = ['plexapi==3.0.5']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)

2
requirements_all.txt
View File

@ -565,7 +565,7 @@ pizzapi==0.0.3
# homeassistant.components.media_player.plex # homeassistant.components.media_player.plex
# homeassistant.components.sensor.plex # homeassistant.components.sensor.plex
plexapi==3.0.3 plexapi==3.0.5
# homeassistant.components.sensor.mhz19 # homeassistant.components.sensor.mhz19
# homeassistant.components.sensor.serial_pm # homeassistant.components.sensor.serial_pm