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

Update frontend to use new BaseCurrentPlaylistController.get()

Browse Source
This commit is contained in:
Stein Magnus Jodal 2010-03-31 20:49:58 +02:00
parent c24c7818e5
commit 7039031161
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mopidy/mpd/frontend.py
View File

@ -300,7 +300,7 @@ class MpdFrontend(object):
"""
songid = int(songid)
try:
track = self.backend.current_playlist.get_by_id(songid)
track = self.backend.current_playlist.get(id=songid)
return self.backend.current_playlist.remove(track)
except KeyError as e:
raise MpdAckError(e[0])
@ -353,7 +353,7 @@ class MpdFrontend(object):
"""
songid = int(songid)
to = int(to)
track = self.backend.current_playlist.get_by_id(songid)
track = self.backend.current_playlist.get(id=songid)
position = self.backend.current_playlist.playlist.tracks.index(track)
self.backend.current_playlist.move(position, position + 1, to)
@ -388,7 +388,7 @@ class MpdFrontend(object):
"""
if tag == 'filename':
try:
track = self.backend.current_playlist.get_by_uri(needle)
track = self.backend.current_playlist.get(uri=needle)
return track.mpd_format()
except KeyError:
return None
@ -407,7 +407,7 @@ class MpdFrontend(object):
if songid is not None:
try:
songid = int(songid)
track = self.backend.current_playlist.get_by_id(songid)
track = self.backend.current_playlist.get(id=songid)
return track.mpd_format()
except KeyError as e:
raise MpdAckError(e[0])
@ -549,8 +549,8 @@ class MpdFrontend(object):
"""
songid1 = int(songid1)
songid2 = int(songid2)
song1 = self.backend.current_playlist.get_by_id(songid1)
song2 = self.backend.current_playlist.get_by_id(songid2)
song1 = self.backend.current_playlist.get(id=songid1)
song2 = self.backend.current_playlist.get(id=songid2)
songpos1 = self.backend.current_playlist.playlist.tracks.index(song1)
songpos2 = self.backend.current_playlist.playlist.tracks.index(song2)
self._current_playlist_swap(songpos1, songpos2)
@ -832,7 +832,7 @@ class MpdFrontend(object):
if songid == -1:
track = self.backend.current_playlist.playlist.tracks[0]
else:
track = self.backend.current_playlist.get_by_id(songid)
track = self.backend.current_playlist.get(id=songid)
return self.backend.playback.play(track)
except KeyError as e:
raise MpdAckError(e[0])

6
tests/mpd/frontend_test.py
View File

@ -476,7 +476,7 @@ class PlaybackControlHandlerTest(unittest.TestCase):
def test_playid_which_does_not_exist(self):
self.b.current_playlist.load(Playlist(tracks=[Track(id=0)]))
result = self.h.handle_request(u'playid "1"')
self.assert_(u'ACK Track with ID "1" not found' in result)
self.assert_(u'ACK Track matching "id=1" not found' in result)
def test_previous(self):
result = self.h.handle_request(u'previous')
@ -598,7 +598,7 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
self.assertEquals(self.b.current_playlist.playlist.length, 2)
result = self.h.handle_request(u'deleteid "0"')
self.assertEquals(self.b.current_playlist.playlist.length, 2)
self.assert_(u'ACK Track with ID "0" not found' in result)
self.assert_(u'ACK Track matching "id=0" not found' in result)
def test_move_songpos(self):
self.b.current_playlist.load(Playlist(tracks=[
@ -700,7 +700,7 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
self.b.current_playlist.load(Playlist(
tracks=[Track(name='a', id=33), Track(name='b', id=38)]))
result = self.h.handle_request(u'playlistid "25"')
self.assert_(u'ACK Track with ID "25" not found' in result)
self.assert_(u'ACK Track matching "id=25" not found' in result)
def test_playlistinfo_without_songpos_or_range(self):
result = self.h.handle_request(u'playlistinfo')