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

Avoid endless loop in 'next' and 'previous'.

Browse Source
This commit is contained in:
Jens Luetjen 2016-02-17 23:41:56 +01:00 committed by Stein Magnus Jodal
parent a2f0d6960f
commit 6116705c1b
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mopidy/core/playback.py
View File

@ -295,6 +295,9 @@ class PlaybackController(object):
""" """
state = self.get_state() state = self.get_state()
current = self._pending_tl_track or self._current_tl_track current = self._pending_tl_track or self._current_tl_track
# avoid endless loop if 'repeat' is 'true' and no track is playable
# * 2 -> second run to get all playable track in a shuffled playlist
count = self.core.tracklist.get_length() * 2
while current: while current:
pending = self.core.tracklist.next_track(current) pending = self.core.tracklist.next_track(current)
@ -306,6 +309,10 @@ class PlaybackController(object):
# if current == pending: # if current == pending:
# break # break
current = pending current = pending
count -= 1
if not count:
logger.info('No playable track in the list.')
break
# TODO return result? # TODO return result?
@ -428,6 +435,9 @@ class PlaybackController(object):
self._previous = True self._previous = True
state = self.get_state() state = self.get_state()
current = self._pending_tl_track or self._current_tl_track current = self._pending_tl_track or self._current_tl_track
# avoid endless loop if 'repeat' is 'true' and no track is playable
# * 2 -> second run to get all playable track in a shuffled playlist
count = self.core.tracklist.get_length() * 2
while current: while current:
pending = self.core.tracklist.previous_track(current) pending = self.core.tracklist.previous_track(current)
@ -439,6 +449,10 @@ class PlaybackController(object):
# if current == pending: # if current == pending:
# break # break
current = pending current = pending
count -= 1
if not count:
logger.info('No playable track in the list.')
break
# TODO: no return value? # TODO: no return value?