diff --git a/mopidy/handler.py b/mopidy/handler.py index 7726f43e..0c53aaa0 100644 --- a/mopidy/handler.py +++ b/mopidy/handler.py @@ -260,7 +260,7 @@ class MpdHandler(object): def _save(self, name): pass # TODO - @register(r'^search (?P(album|artist|filename|title)) (?P.+)$') + @register(r'^search "(?P(album|artist|filename|title))" "(?P.+)"$') def _search(self, type, what): pass # TODO diff --git a/tests/handlertest.py b/tests/handlertest.py index 548dffde..a654f9a3 100644 --- a/tests/handlertest.py +++ b/tests/handlertest.py @@ -458,23 +458,23 @@ class MusicDatabaseHandlerTest(unittest.TestCase): self.assertEquals(lsinfo_result, listplaylists_result) def test_search_album(self): - result = self.h.handle_request(u'search album analbum') + result = self.h.handle_request(u'search "album" "analbum"') self.assert_(result is None) def test_search_artist(self): - result = self.h.handle_request(u'search artist anartist') + result = self.h.handle_request(u'search "artist" "anartist"') self.assert_(result is None) def test_search_filename(self): - result = self.h.handle_request(u'search filename afilename') + result = self.h.handle_request(u'search "filename" "afilename"') self.assert_(result is None) def test_search_title(self): - result = self.h.handle_request(u'search title atitle') + result = self.h.handle_request(u'search "title" "atitle"') self.assert_(result is None) def test_search_else_should_fail(self): - result = self.h.handle_request(u'search sometype something') + result = self.h.handle_request(u'search "sometype" "something"') self.assert_(result is False) def test_update_without_uri(self):