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

Moved playback info into setmedia type as it was just used for the next anyway

Browse Source
This commit is contained in:
Ryan McLean
2017-12-19 10:28:42 +00:00
parent d0e540f60f
commit e8fde3f5c4
1 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -363,47 +363,13 @@ class PlexClient(MediaPlayerDevice):
if self._is_player_active and self._session is not None: if self._is_player_active and self._session is not None:
self._session_type = self._session.type self._session_type = self._session.type
self._media_duration = self._session.duration self._media_duration = self._session.duration
# title (movie name, tv episode name, music song name)
self._media_title = self._session.title
# media type # media type
self._set_media_type() self._set_media_type()
else: else:
self._session_type = None self._session_type = None
# title (movie name, tv episode name, music song name)
if self._session and self._is_player_active:
self._media_title = self._session.title
# Movies
if (self.media_content_type == MEDIA_TYPE_VIDEO and
self._session.year is not None):
self._media_title += ' (' + str(self._session.year) + ')'
# TV Show
if self._media_content_type is MEDIA_TYPE_TVSHOW:
# season number (00)
if callable(self._session.seasons):
self._media_season = self._session.seasons()[0].index.zfill(2)
elif self._session.parentIndex is not None:
self._media_season = self._session.parentIndex.zfill(2)
else:
self._media_season = None
# show name
self._media_series_title = self._session.grandparentTitle
# episode number (00)
if self._session.index is not None:
self._media_episode = str(self._session.index).zfill(2)
# Music
if self._media_content_type == MEDIA_TYPE_MUSIC:
self._media_album_name = self._session.parentTitle
self._media_album_artist = self._session.grandparentTitle
self._media_track = self._session.index
self._media_artist = self._session.originalTitle
# use album artist if track artist is missing
if self._media_artist is None:
_LOGGER.debug("Using album artist because track artist "
"was not found: %s", self.entity_id)
self._media_artist = self._media_album_artist
if self._session is not None: if self._session is not None:
self._app_name = self._session.section().title \ self._app_name = self._session.section().title \
if self._session.section() is not None else '' if self._session.section() is not None else ''
@@ -439,16 +405,44 @@ class PlexClient(MediaPlayerDevice):
self._state = STATE_OFF self._state = STATE_OFF
def _set_media_type(self): def _set_media_type(self):
def _tvshow_info():
# season number (00)
if callable(self._session.seasons):
self._media_season = self._session.seasons()[0].index.zfill(2)
elif self._session.parentIndex is not None:
self._media_season = self._session.parentIndex.zfill(2)
else:
self._media_season = None
# show name
self._media_series_title = self._session.grandparentTitle
# episode number (00)
if self._session.index is not None:
self._media_episode = str(self._session.index).zfill(2)
if self._session_type == 'clip': if self._session_type == 'clip':
_LOGGER.debug("Clip content type detected, compatibility may " _LOGGER.debug("Clip content type detected, compatibility may "
"vary: %s", self.entity_id) "vary: %s", self.entity_id)
self._media_content_type = MEDIA_TYPE_TVSHOW self._media_content_type = MEDIA_TYPE_TVSHOW
_tvshow_info()
elif self._session_type == 'episode': elif self._session_type == 'episode':
self._media_content_type = MEDIA_TYPE_TVSHOW self._media_content_type = MEDIA_TYPE_TVSHOW
_tvshow_info()
elif self._session_type == 'movie': elif self._session_type == 'movie':
self._media_content_type = MEDIA_TYPE_VIDEO self._media_content_type = MEDIA_TYPE_VIDEO
if self._session.year is not None and \
self._media_title is not None:
self._media_title += ' (' + str(self._session.year) + ')'
elif self._session_type == 'track': elif self._session_type == 'track':
self._media_content_type = MEDIA_TYPE_MUSIC self._media_content_type = MEDIA_TYPE_MUSIC
self._media_album_name = self._session.parentTitle
self._media_album_artist = self._session.grandparentTitle
self._media_track = self._session.index
self._media_artist = self._session.originalTitle
# use album artist if track artist is missing
if self._media_artist is None:
_LOGGER.debug("Using album artist because track artist "
"was not found: %s", self.entity_id)
self._media_artist = self._media_album_artist
def force_idle(self): def force_idle(self):
"""Force client to idle.""" """Force client to idle."""