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

added song and songid to status and handling of prev/next commands

Browse Source
This commit is contained in:
Johannes Knutsen 2009-12-26 02:21:47 +01:00
parent 0606d82e69
commit 8bd6d5092e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mopidy/handler.py
View File

@ -167,7 +167,7 @@ class MpdHandler(object):
@register(r'^next$') @register(r'^next$')
def _next(self): def _next(self):
pass # TODO return self.backend.next()
@register(r'^password "(?P<password>[^"]+)"$') @register(r'^password "(?P<password>[^"]+)"$')
def _password(self, password): def _password(self, password):
@ -212,9 +212,9 @@ class MpdHandler(object):
def _playlistfind(self, tag, needle): def _playlistfind(self, tag, needle):
pass # TODO pass # TODO
@register(r'^playlistid( (?P<songid>\S+))*$') @register(r'^playlistid( "(?P<songid>\S+)")*$')
def _playlistid(self, songid=None): def _playlistid(self, songid=None):
pass # TODO return self.backend.playlist_info(songid, None, None)
@register(r'^playlistinfo( "((?P<songpos>\d+)|(?P<start>\d+):(?P<end>\d+)*)")*$') @register(r'^playlistinfo( "((?P<songpos>\d+)|(?P<start>\d+):(?P<end>\d+)*)")*$')
def _playlistinfo(self, songpos=None, start=None, end=None): def _playlistinfo(self, songpos=None, start=None, end=None):
@ -238,7 +238,7 @@ class MpdHandler(object):
@register(r'^previous$') @register(r'^previous$')
def _previous(self): def _previous(self):
pass # TODO return self.backend.previous()
@register(r'^rename (?P<old_name>\S+) (?P<new_name>\S+)$') @register(r'^rename (?P<old_name>\S+) (?P<new_name>\S+)$')
def _rename(self, old_name, new_name): def _rename(self, old_name, new_name):
@ -342,6 +342,8 @@ class MpdHandler(object):
('playlistlength', self.backend.status_playlist_length()), ('playlistlength', self.backend.status_playlist_length()),
('xfade', self.backend.status_xfade()), ('xfade', self.backend.status_xfade()),
('state', self.backend.status_state()), ('state', self.backend.status_state()),
('song', self.backend.status_song_id()),
('songid', self.backend.status_song_id()),
] ]
@register(r'^swap (?P<songpos1>\d+) (?P<songpos2>\d+)$') @register(r'^swap (?P<songpos1>\d+) (?P<songpos2>\d+)$')

2
tests/handlertest.py
View File

@ -312,7 +312,7 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
self.assert_(result is None) self.assert_(result is None)
def test_playlistid_with_songid(self): def test_playlistid_with_songid(self):
result = self.h.handle_request(u'playlistid 10') result = self.h.handle_request(u'playlistid "10"')
self.assert_(result is None) self.assert_(result is None)
def test_playlistinfo_without_songpos_or_range(self): def test_playlistinfo_without_songpos_or_range(self):