Add empty handlers for handling of the saved playlists

This commit is contained in:
Stein Magnus Jodal 2009-12-24 02:33:15 +01:00
parent ec048bdd99
commit 8ddb3554ba
2 changed files with 101 additions and 22 deletions

View File

@ -39,8 +39,8 @@ class MpdHandler(object):
def _add(self, uri):
pass # TODO
@register(r'^addid "(?P<uri>[^"]*)"( (?P<position>\d+))*$')
def _add(self, uri, position=None):
@register(r'^addid "(?P<uri>[^"]*)"( (?P<songpos>\d+))*$')
def _add(self, uri, songpos=None):
pass # TODO
return {'id': 0}
@ -69,8 +69,8 @@ class MpdHandler(object):
def _currentsong(self):
return self.backend.current_song()
@register(r'^delete ((?P<position>\d+)|(?P<start>\d+):(?P<end>\d+)*)$')
def _delete(self, position=None, start=None, end=None):
@register(r'^delete ((?P<songpos>\d+)|(?P<start>\d+):(?P<end>\d+)*)$')
def _delete(self, songpos=None, start=None, end=None):
pass # TODO
@register(r'^deleteid (?P<songid>.*)$')
@ -81,18 +81,30 @@ class MpdHandler(object):
def _idle(self, subsystems=None):
pass # TODO
@register(r'^listplaylist (?P<name>.+)$')
def _listplaylist(self, name):
pass # TODO
@register(r'^listplaylistinfo (?P<name>.+)$')
def _listplaylistinfo(self, name):
pass # TODO
@register(r'^listplaylists$')
def _listplaylists(self):
return self.backend.list_playlists()
@register(r'^load (?P<name>.+)$')
def _load(self, name):
pass # TODO
@register(r'^lsinfo( "(?P<uri>[^"]*)")*$')
def _lsinfo(self, uri):
if uri == u'/':
return self._listplaylists()
pass # TODO
@register(r'^move ((?P<position>\d+)|(?P<start>\d+):(?P<end>\d+)*) (?P<to>\d+)$')
def _move(self, position=None, start=None, end=None, to=None):
@register(r'^move ((?P<songpos>\d+)|(?P<start>\d+):(?P<end>\d+)*) (?P<to>\d+)$')
def _move(self, songpos=None, start=None, end=None, to=None):
pass # TODO
@register(r'^moveid (?P<songid>\S+) (?P<to>\d+)$')
@ -123,6 +135,18 @@ class MpdHandler(object):
def _playlist(self):
return self._playlistinfo()
@register(r'^playlistadd (?P<name>\S+) "(?P<uri>[^"]+)"$')
def _playlistadd(self, name, uri):
pass # TODO
@register(r'^playlistclear (?P<name>\S+)$')
def _playlistclear(self, name):
pass # TODO
@register(r'^playlistdelete (?P<name>\S+) (?P<songpos>\d+)$')
def _playlistdelete(self, name, songpos):
pass # TODO
@register(r'^playlistfind (?P<tag>\S+) (?P<needle>\S+)$')
def _playlistfind(self, tag, needle):
pass # TODO
@ -131,15 +155,19 @@ class MpdHandler(object):
def _playlistid(self, songid=None):
pass # TODO
@register(r'^playlistinfo( ((?P<position>\d+)|(?P<start>\d+):(?P<end>\d+)*))*$')
def _playlistinfo(self, position=None, start=None, end=None):
@register(r'^playlistinfo( ((?P<songpos>\d+)|(?P<start>\d+):(?P<end>\d+)*))*$')
def _playlistinfo(self, songpos=None, start=None, end=None):
pass # TODO
@register(r'^playlistmove (?P<name>\S+) (?P<songid>\S+) (?P<songpos>\d+)$')
def _playlistdelete(self, name, songid, songpos):
pass # TODO
@register(r'^playlistsearch (?P<tag>\S+) (?P<needle>\S+)$')
def _playlistsearch(self, tag, needle):
pass # TODO
@register(r'^plchanges (?P<version>\d+)$')
@register(r'^plchanges "(?P<version>\d+)"$')
def _plchanges(self, version):
return self.backend.playlist_changes(version)
@ -151,6 +179,10 @@ class MpdHandler(object):
def _previous(self):
pass # TODO
@register(r'^rename (?P<old_name>\S+) (?P<new_name>\S+)$')
def _rename(self, old_name, new_name):
pass # TODO
@register(r'^random (?P<state>[01])$')
def _random(self, state):
state = int(state)
@ -173,7 +205,15 @@ class MpdHandler(object):
@register(r'^replay_gain_status$')
def _replay_gain_status(self):
return u'off'
return u'off' # TODO
@register(r'^rm (?P<name>\S+)$')
def _rm(self, name):
pass # TODO
@register(r'^save (?P<name>\S+)$')
def _save(self, name):
pass # TODO
@register(r'^seek (?P<songpos>.+) (?P<seconds>\d+)$')
def _seek(self, songpos, seconds):
@ -235,8 +275,8 @@ class MpdHandler(object):
'state': self.backend.status_state(),
}
@register(r'^swap (?P<position1>\d+) (?P<position2>\d+)$')
def _swap(self, position1, position2):
@register(r'^swap (?P<songpos1>\d+) (?P<songpos2>\d+)$')
def _swap(self, songpos1, songpos2):
pass # TODO
@register(r'^swapid (?P<songid1>\S+) (?P<songid2>\S+)$')

View File

@ -235,11 +235,11 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
result = self.h.handle_request(u'add "file:///dev/urandom"')
self.assert_(result is None)
def test_addid_without_position(self):
def test_addid_without_songpos(self):
result = self.h.handle_request(u'addid "file:///dev/urandom"')
self.assert_('id' in result)
def test_addid_with_position(self):
def test_addid_with_songpos(self):
result = self.h.handle_request(u'addid "file:///dev/urandom" 0')
self.assert_('id' in result)
@ -247,7 +247,7 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
result = self.h.handle_request(u'clear')
self.assert_(result is None)
def test_delete_position(self):
def test_delete_songpos(self):
result = self.h.handle_request(u'delete 5')
self.assert_(result is None)
@ -263,7 +263,7 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
result = self.h.handle_request(u'deleteid 0')
self.assert_(result is None)
def test_move_position(self):
def test_move_songpos(self):
result = self.h.handle_request(u'move 5 0')
self.assert_(result is None)
@ -296,11 +296,11 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
result = self.h.handle_request(u'playlistid 10')
self.assert_(result is None)
def test_playlistinfo_without_position_or_range(self):
def test_playlistinfo_without_songpos_or_range(self):
result = self.h.handle_request(u'playlistinfo')
self.assert_(result is None)
def test_playlistinfo_with_position(self):
def test_playlistinfo_with_songpos(self):
result = self.h.handle_request(u'playlistinfo 5')
self.assert_(result is None)
@ -317,7 +317,7 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
self.assert_(result is None)
def test_plchanges(self):
result = self.h.handle_request(u'plchanges 0')
result = self.h.handle_request(u'plchanges "0"')
self.assert_(result is None)
def test_plchangesposid(self):
@ -349,11 +349,50 @@ class StoredPlaylistsHandlerTest(unittest.TestCase):
def setUp(self):
self.h = handler.MpdHandler()
def test_listplaylists(self):
result = self.h._listplaylists()
def test_listplaylist(self):
result = self.h.handle_request(u'listplaylist name')
self.assert_(result is None)
pass # TODO
def test_listplaylistinfo(self):
result = self.h.handle_request(u'listplaylistinfo name')
self.assert_(result is None)
def test_listplaylists(self):
result = self.h.handle_request(u'listplaylists')
self.assert_(result is None)
def test_load(self):
result = self.h.handle_request(u'load name')
self.assert_(result is None)
def test_playlistadd(self):
result = self.h.handle_request(
u'playlistadd name "file:///dev/urandom"')
self.assert_(result is None)
def test_playlistclear(self):
result = self.h.handle_request(u'playlistclear name')
self.assert_(result is None)
def test_playlistdelete(self):
result = self.h.handle_request(u'playlistdelete name 5')
self.assert_(result is None)
def test_playlistmove(self):
result = self.h.handle_request(u'playlistmove name 5a 10')
self.assert_(result is None)
def test_rename(self):
result = self.h.handle_request(u'rename name new_name')
self.assert_(result is None)
def test_rm(self):
result = self.h.handle_request(u'rm name')
self.assert_(result is None)
def test_save(self):
result = self.h.handle_request(u'save name')
self.assert_(result is None)
class MusicDatabaseHandlerTest(unittest.TestCase):