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

Update 'addid' to return CPID instead of GID

Browse Source
This commit is contained in:
Stein Magnus Jodal 2010-08-02 14:27:57 +02:00
parent 80df6d1fea
commit 44309345db
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mopidy/mpd/frontend.py
View File

@ -273,8 +273,8 @@ class MpdFrontend(object):
raise MpdNoExistError(u'No such song', command=u'addid')
if songpos and songpos > len(self.backend.current_playlist.tracks):
raise MpdArgError(u'Bad song index', command=u'addid')
self.backend.current_playlist.add(track, at_position=songpos)
return ('Id', track.id)
cp_track = self.backend.current_playlist.add(track, at_position=songpos)
return ('Id', cp_track[0])
@handle_pattern(r'^delete "(?P<start>\d+):(?P<end>\d+)*"$')
def _current_playlist_delete_range(self, start, end=None):

10
tests/mpd/current_playlist_test.py
View File

@ -29,7 +29,7 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
u'ACK [50@0] {add} directory or file not found')
def test_addid_without_songpos(self):
needle = Track(uri='dummy://foo', id=137)
needle = Track(uri='dummy://foo')
self.b.library._library = [Track(), Track(), needle, Track()]
self.b.current_playlist.load(
[Track(), Track(), Track(), Track(), Track()])
@ -37,11 +37,12 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
result = self.h.handle_request(u'addid "dummy://foo"')
self.assertEqual(len(self.b.current_playlist.tracks), 6)
self.assertEqual(self.b.current_playlist.tracks[5], needle)
self.assert_(u'Id: 137' in result)
self.assert_(u'Id: %d' % self.b.current_playlist.cp_tracks[5][0]
in result)
self.assert_(u'OK' in result)
def test_addid_with_songpos(self):
needle = Track(uri='dummy://foo', id=137)
needle = Track(uri='dummy://foo')
self.b.library._library = [Track(), Track(), needle, Track()]
self.b.current_playlist.load(
[Track(), Track(), Track(), Track(), Track()])
@ -49,7 +50,8 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
result = self.h.handle_request(u'addid "dummy://foo" "3"')
self.assertEqual(len(self.b.current_playlist.tracks), 6)
self.assertEqual(self.b.current_playlist.tracks[3], needle)
self.assert_(u'Id: 137' in result)
self.assert_(u'Id: %d' % self.b.current_playlist.cp_tracks[3][0]
in result)
self.assert_(u'OK' in result)
def test_addid_with_songpos_out_of_bounds_should_ack(self):