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

Updating tidy-up-core to jodal specs and changing one name. Still need to update docs

Browse Source
This commit is contained in:
Javier Domingo Cansino 2013-10-11 12:41:11 +02:00
parent 686dd5981d
commit a14a19447b
2 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mopidy/core/playback.py
View File

@ -165,7 +165,7 @@ class PlaybackController(object):
else:
self.stop(clear_current_track=True)
self.core.tracklist.mark("consumed", original_tl_track)
self.core.tracklist.mark_consumed(original_tl_track)
def on_tracklist_change(self):
"""
@ -230,7 +230,7 @@ class PlaybackController(object):
backend = self._get_backend()
if not backend or not backend.playback.play(tl_track.track).get():
logger.warning('Track is not playable: %s', tl_track.track.uri)
self.core.tracklist.mark("unplayable", tl_track)
self.core.tracklist.mark_unplayable(tl_track)
if on_error_step == 1:
# TODO: can cause an endless loop for single track repeat.
self.next()
@ -238,7 +238,7 @@ class PlaybackController(object):
self.previous()
return
self.core.tracklist.mark("played", tl_track)
self.core.tracklist.mark_starting(tl_track)
self._trigger_track_playback_started()

35
mopidy/core/tracklist.py
View File

@ -438,30 +438,19 @@ class TracklistController(object):
"""
return self._tl_tracks[start:end]
def mark(self, what, tl_track):
"""
Marks the given track as specified. Currently supports::
* `consumed` The track has been completely played.
* `played` The track has been played, at least a piece of it.
* `unplayable` The track is unplayable
def mark_consumed(self, tl_track):
if not self.consume:
return False
self.remove(tlid=tl_track.tlid)
return True
:param what: What to be marked as
:type what: string
:param tl_track: Track to mark
:type tl_track: :class:`mopidy.models.TlTrack`
:rtype: True if the track was actually removed from the tracklist
"""
if what == "consumed":
if not self.consume:
return False
self.remove(tlid=tl_track.tlid)
return True
elif what == "played":
if self.random and tl_track in self._shuffled:
self._shuffled.remove(tl_track)
elif what == "unplayable":
if self.random and self._shuffled:
self._shuffled.remove(tl_track)
def mark_starting(self, tl_track):
if self.random and tl_track in self._shuffled:
self._shuffled.remove(tl_track)
def mark_unplayable(self, tl_track):
if self.random and self._shuffled:
self._shuffled.remove(tl_track)
def _trigger_tracklist_changed(self):
self._first_shuffle = True