andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: Cleanup internals of next_track a bit

Browse Source
This commit is contained in:
Thomas Adamcik 2015-04-17 20:59:13 +02:00 committed by
parent 691abb2431
commit aab143aeec
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mopidy/core/tracklist.py
View File

@ -274,23 +274,22 @@ class TracklistController(object):
random.shuffle(self._shuffled) random.shuffle(self._shuffled)
if self.get_random(): if self.get_random():
try: if self._shuffled:
return self._shuffled[0] return self._shuffled[0]
except IndexError: return None
return None
if tl_track is None: if tl_track is None:
return self._tl_tracks[0] next_index = 0
else:
next_index = self.index(tl_track) + 1
next_index = self.index(tl_track) + 1
if self.get_repeat(): if self.get_repeat():
next_index %= len(self._tl_tracks) next_index %= len(self._tl_tracks)
elif next_index >= len(self._tl_tracks):
try:
return self._tl_tracks[next_index]
except IndexError:
return None return None
return self._tl_tracks[next_index]
def previous_track(self, tl_track): def previous_track(self, tl_track):
""" """
Returns the track that will be played if calling Returns the track that will be played if calling