MPD: Use CPID in 'plchangesposid' output

This commit is contained in:
Stein Magnus Jodal 2010-08-02 23:02:51 +02:00
parent 01cd597321
commit 999de87d07
2 changed files with 10 additions and 8 deletions

View File

@ -518,10 +518,10 @@ class MpdFrontend(object):
# XXX Naive implementation that returns all tracks as changed
if int(version) != self.backend.current_playlist.version:
result = []
for position, track in enumerate(
self.backend.current_playlist.tracks):
for (position, (cpid, track)) in enumerate(
self.backend.current_playlist.cp_tracks):
result.append((u'cpos', position))
result.append((u'Id', track.id))
result.append((u'Id', cpid))
return result
@handle_pattern(r'^shuffle$')

View File

@ -317,15 +317,17 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
self.assert_(u'OK' in result)
def test_plchangesposid(self):
self.b.current_playlist.load(
[Track(id=11), Track(id=12), Track(id=13)])
self.b.current_playlist.load([Track(), Track(), Track()])
result = self.h.handle_request(u'plchangesposid "0"')
self.assert_(u'cpos: 0' in result)
self.assert_(u'Id: 11' in result)
self.assert_(u'Id: %d' % self.b.current_playlist.cp_tracks[0][0]
in result)
self.assert_(u'cpos: 2' in result)
self.assert_(u'Id: 12' in result)
self.assert_(u'Id: %d' % self.b.current_playlist.cp_tracks[1][0]
in result)
self.assert_(u'cpos: 2' in result)
self.assert_(u'Id: 13' in result)
self.assert_(u'Id: %d' % self.b.current_playlist.cp_tracks[2][0]
in result)
self.assert_(u'OK' in result)
def test_shuffle_without_range(self):