From 3f41fc8df70933a8df5a21f557dcd12d1c79df22 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Fri, 25 Dec 2009 15:37:25 +0100 Subject: [PATCH] Add 'urlhandler' command --- mopidy/backends/dummy.py | 3 ++- mopidy/backends/spotify.py | 3 ++- mopidy/handler.py | 4 ++++ tests/handlertest.py | 4 ++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mopidy/backends/dummy.py b/mopidy/backends/dummy.py index b8713c81..c3862bb7 100644 --- a/mopidy/backends/dummy.py +++ b/mopidy/backends/dummy.py @@ -1,4 +1,5 @@ from mopidy.backends.base import BaseBackend class DummyBackend(BaseBackend): - pass + def url_handlers(self): + return [u'dummy:'] diff --git a/mopidy/backends/spotify.py b/mopidy/backends/spotify.py index 1b9e6866..f159f60a 100644 --- a/mopidy/backends/spotify.py +++ b/mopidy/backends/spotify.py @@ -28,4 +28,5 @@ class SpotifyBackend(BaseBackend): playlists.append(u'playlist: %s' % playlist.name.decode('utf-8')) return playlists - + def url_handlers(self): + return [u'spotify:', u'http://open.spotify.com/'] diff --git a/mopidy/handler.py b/mopidy/handler.py index c319f3af..aad615e4 100644 --- a/mopidy/handler.py +++ b/mopidy/handler.py @@ -340,3 +340,7 @@ class MpdHandler(object): @register(r'^update( "(?P[^"]+)")*$') def _update(self, uri=None, rescan_unmodified_files=False): return u'updating_db: 0' # TODO + + @register(r'^urlhandlers$') + def _urlhandlers(self): + return self.backend.url_handlers() diff --git a/tests/handlertest.py b/tests/handlertest.py index 3b5e1bb4..863a7b00 100644 --- a/tests/handlertest.py +++ b/tests/handlertest.py @@ -557,4 +557,8 @@ class ReflectionHandlerTest(unittest.TestCase): def setUp(self): self.h = handler.MpdHandler(backend=DummyBackend) + def test_urlhandlers(self): + result = self.h.handle_request(u'urlhandlers') + self.assert_('dummy:' in result) + pass # TODO