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

String formatting, import order, type check fixes

Browse Source
This commit is contained in:
JesseWebDotCom 2017-04-04 22:33:52 -04:00
parent b99dd19ad6
commit 90a834cbda
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -789,7 +789,10 @@ class PlexClient(MediaPlayerDevice):
media = self.device.server.library.section( media = self.device.server.library.section(
src['library_name']).get(src['video_name']) src['library_name']).get(src['video_name'])
if media and media_type == 'EPISODE' and str(media.type) == 'playlist': import plexapi.playlist
if (media and media_type == 'EPISODE' and
isinstance(media, plexapi.playlist.Playlist)):
# delete episode playlist after being loaded into a play queue
self._client_play_media(media=media, delete=True, self._client_play_media(media=media, delete=True,
shuffle=src['shuffle']) shuffle=src['shuffle'])
elif media: elif media:
@ -805,7 +808,8 @@ class PlexClient(MediaPlayerDevice):
show_name) show_name)
if not season_number: if not season_number:
playlist_name = (self.entity_id + ' - ' + show_name + ' Episodes') playlist_name = "{} - {} Episodes".format(
self.entity_id, show_name)
return self.device.server.createPlaylist( return self.device.server.createPlaylist(
playlist_name, show.episodes()) playlist_name, show.episodes())
@ -821,8 +825,8 @@ class PlexClient(MediaPlayerDevice):
str(episode_number).zfill(2)) str(episode_number).zfill(2))
else: else:
if not episode_number: if not episode_number:
playlist_name = (self.entity_id + ' - ' + show_name + playlist_name = "{} - {} Season {} Episodes".format(
' Season ' + str(season_number) + ' Episodes') self.entity_id, show_name, str(season_number))
return self.device.server.createPlaylist( return self.device.server.createPlaylist(
playlist_name, target_season.episodes()) playlist_name, target_season.episodes())
@ -850,6 +854,10 @@ class PlexClient(MediaPlayerDevice):
playqueue = plexapi.playqueue.PlayQueue.create(self.device.server, playqueue = plexapi.playqueue.PlayQueue.create(self.device.server,
media, **params) media, **params)
# delete dynamic playlists used to build playqueue (ex. play tv season)
if delete:
media.delete()
self._local_client_control_fix() self._local_client_control_fix()
server_url = self.device.server.baseurl.split(':') server_url = self.device.server.baseurl.split(':')
@ -866,10 +874,6 @@ class PlexClient(MediaPlayerDevice):
'/playQueues/%s?window=100&own=1' % playqueue.playQueueID, '/playQueues/%s?window=100&own=1' % playqueue.playQueueID,
}, **params)) }, **params))
# delete dynamic playlists used to build playqueue (ex. play tv season)
if delete:
media.delete()
@property @property
def device_state_attributes(self): def device_state_attributes(self):
"""Return the scene state attributes.""" """Return the scene state attributes."""