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

Merge remote-tracking branch 'sandos/develop' into feature/mpd-performance-fixes

Browse Source
This commit is contained in:
Stein Magnus Jodal 2011-12-27 22:09:40 +01:00
commit 449bb87b90
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mopidy/backends/base/current_playlist.py
View File

@ -39,6 +39,13 @@ class CurrentPlaylistController(object):
""" """
return [ct[1] for ct in self._cp_tracks] return [ct[1] for ct in self._cp_tracks]
@property
def tracks_len(self):
"""
Length of current playlist
"""
return len(self._cp_tracks)
@property @property
def version(self): def version(self):
""" """

6
mopidy/frontends/mpd/protocol/current_playlist.py
View File

@ -254,6 +254,12 @@ def playlistinfo(context, songpos=None,
end = songpos + 1 end = songpos + 1
if start == -1: if start == -1:
end = None end = None
else:
#Fetch one single track, hot code path (avoid deep-copying the entire playlist)
res = context.backend.current_playlist.get(cpid=songpos).get()
cpids = [res.cpid]
l = [res.track]
return tracks_to_mpd_format(l, 0, 1, cpids=cpids)
cpids = [ct[0] for ct in cpids = [ct[0] for ct in
context.backend.current_playlist.cp_tracks.get()] context.backend.current_playlist.cp_tracks.get()]
return tracks_to_mpd_format( return tracks_to_mpd_format(

4
mopidy/frontends/mpd/protocol/status.py
View File

@ -166,7 +166,7 @@ def status(context):
decimal places for millisecond precision. decimal places for millisecond precision.
""" """
futures = { futures = {
'current_playlist.tracks': context.backend.current_playlist.tracks, 'current_playlist.tracks_len': context.backend.current_playlist.tracks_len,
'current_playlist.version': context.backend.current_playlist.version, 'current_playlist.version': context.backend.current_playlist.version,
'mixer.volume': context.mixer.volume, 'mixer.volume': context.mixer.volume,
'playback.consume': context.backend.playback.consume, 'playback.consume': context.backend.playback.consume,
@ -213,7 +213,7 @@ def _status_consume(futures):
return 0 return 0
def _status_playlist_length(futures): def _status_playlist_length(futures):
return len(futures['current_playlist.tracks'].get()) return futures['current_playlist.tracks_len'].get()
def _status_playlist_version(futures): def _status_playlist_version(futures):
return futures['current_playlist.version'].get() return futures['current_playlist.version'].get()