mirror of
https://github.com/home-assistant/core.git
synced 2025-07-24 05:37:44 +00:00
Fixed various property methods to make sure they all had a fall through return and removed unnecessary "else" statements
This commit is contained in:
parent
5027acfda1
commit
a8e0ca6d3f
@ -95,8 +95,7 @@ class PlexClient(MediaPlayerDevice):
|
|||||||
return STATE_PLAYING
|
return STATE_PLAYING
|
||||||
elif state == 'paused':
|
elif state == 'paused':
|
||||||
return STATE_PAUSED
|
return STATE_PAUSED
|
||||||
else:
|
return STATE_UNKNOWN
|
||||||
return STATE_UNKNOWN
|
|
||||||
|
|
||||||
def update(self):
|
def update(self):
|
||||||
timeline = self.client.timeline()
|
timeline = self.client.timeline()
|
||||||
@ -115,21 +114,19 @@ class PlexClient(MediaPlayerDevice):
|
|||||||
""" Content type of current playing media. """
|
""" Content type of current playing media. """
|
||||||
if self._media is None:
|
if self._media is None:
|
||||||
return None
|
return None
|
||||||
else:
|
media_type = self.server.library.getByKey(
|
||||||
media_type = self.server.library.getByKey(
|
self.media_content_id).type
|
||||||
self.media_content_id).type
|
if media_type == 'episode':
|
||||||
if media_type == 'episode':
|
return MEDIA_TYPE_TVSHOW
|
||||||
return MEDIA_TYPE_TVSHOW
|
elif media_type == 'movie':
|
||||||
elif media_type == 'movie':
|
return MEDIA_TYPE_VIDEO
|
||||||
return MEDIA_TYPE_VIDEO
|
return None
|
||||||
return None
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def media_duration(self):
|
def media_duration(self):
|
||||||
""" Duration of current playing media in seconds. """
|
""" Duration of current playing media in seconds. """
|
||||||
if self._media is not None:
|
if self._media is not None:
|
||||||
total_time = self._media.get('duration')
|
total_time = self._media.get('duration')
|
||||||
|
|
||||||
return total_time
|
return total_time
|
||||||
|
|
||||||
@property
|
@property
|
||||||
@ -137,8 +134,7 @@ class PlexClient(MediaPlayerDevice):
|
|||||||
""" Image url of current playing media. """
|
""" Image url of current playing media. """
|
||||||
if self._media is not None:
|
if self._media is not None:
|
||||||
return self.server.library.getByKey(self.media_content_id).thumbUrl
|
return self.server.library.getByKey(self.media_content_id).thumbUrl
|
||||||
else:
|
return None
|
||||||
return None
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def media_title(self):
|
def media_title(self):
|
||||||
@ -154,8 +150,7 @@ class PlexClient(MediaPlayerDevice):
|
|||||||
show_season = self.server.library.getByKey(
|
show_season = self.server.library.getByKey(
|
||||||
self.media_content_id).season().index
|
self.media_content_id).season().index
|
||||||
return show_season
|
return show_season
|
||||||
else:
|
return None
|
||||||
return None
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def media_series_title(self):
|
def media_series_title(self):
|
||||||
@ -164,8 +159,7 @@ class PlexClient(MediaPlayerDevice):
|
|||||||
series_title = self.server.library.getByKey(
|
series_title = self.server.library.getByKey(
|
||||||
self.media_content_id).show().title
|
self.media_content_id).show().title
|
||||||
return series_title
|
return series_title
|
||||||
else:
|
return None
|
||||||
return None
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def media_episode(self):
|
def media_episode(self):
|
||||||
@ -174,8 +168,7 @@ class PlexClient(MediaPlayerDevice):
|
|||||||
show_episode = self.server.library.getByKey(
|
show_episode = self.server.library.getByKey(
|
||||||
self.media_content_id).index
|
self.media_content_id).index
|
||||||
return show_episode
|
return show_episode
|
||||||
else:
|
return None
|
||||||
return None
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def supported_media_commands(self):
|
def supported_media_commands(self):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user