Fixed various property methods to make sure they all had a fall through return and removed unnecessary "else" statements

This commit is contained in:
miniconfig 2015-09-21 10:44:24 -04:00
parent 5027acfda1
commit a8e0ca6d3f

View File

@ -95,7 +95,6 @@ class PlexClient(MediaPlayerDevice):
return STATE_PLAYING
elif state == 'paused':
return STATE_PAUSED
else:
return STATE_UNKNOWN
def update(self):
@ -115,7 +114,6 @@ class PlexClient(MediaPlayerDevice):
""" Content type of current playing media. """
if self._media is None:
return None
else:
media_type = self.server.library.getByKey(
self.media_content_id).type
if media_type == 'episode':
@ -129,7 +127,6 @@ class PlexClient(MediaPlayerDevice):
""" Duration of current playing media in seconds. """
if self._media is not None:
total_time = self._media.get('duration')
return total_time
@property
@ -137,7 +134,6 @@ class PlexClient(MediaPlayerDevice):
""" Image url of current playing media. """
if self._media is not None:
return self.server.library.getByKey(self.media_content_id).thumbUrl
else:
return None
@property
@ -154,7 +150,6 @@ class PlexClient(MediaPlayerDevice):
show_season = self.server.library.getByKey(
self.media_content_id).season().index
return show_season
else:
return None
@property
@ -164,7 +159,6 @@ class PlexClient(MediaPlayerDevice):
series_title = self.server.library.getByKey(
self.media_content_id).show().title
return series_title
else:
return None
@property
@ -174,7 +168,6 @@ class PlexClient(MediaPlayerDevice):
show_episode = self.server.library.getByKey(
self.media_content_id).index
return show_episode
else:
return None
@property