From 1966bb457cd95b3775212c767e5c803cae8c655d Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Wed, 30 Jun 2010 12:53:39 +0200 Subject: [PATCH 1/7] MPD: A new way GMPC uses 'list' --- mopidy/mpd/frontend.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mopidy/mpd/frontend.py b/mopidy/mpd/frontend.py index ff62e674..2d8c783d 100644 --- a/mopidy/mpd/frontend.py +++ b/mopidy/mpd/frontend.py @@ -659,6 +659,9 @@ class MpdFrontend(object): *GMPC:* - does not add quotes around the field argument. + - asks for multiple fields, i.e.:: + + list album artist "an artist name" *ncmpc:* From 7922795d2fa44ea55ba28af13e14e131c5e1af44 Mon Sep 17 00:00:00 2001 From: Kristian Date: Wed, 30 Jun 2010 20:08:53 +0200 Subject: [PATCH 2/7] Return OK on noidle --- docs/changes.rst | 2 ++ mopidy/mpd/frontend.py | 2 +- tests/mpd/frontend_test.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index 20ce474a..f6058708 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -26,6 +26,8 @@ We got an updated :doc:`release roadmap `! command error instead of crashing. - ``list`` accepts field argument without quotes and capitalized, to work with GMPC and ncmpc. + - ``noidle`` command now returns ``OK`` instead of an error. Should make some + clients work a bit better. 0.1.0a2 (2010-06-02) diff --git a/mopidy/mpd/frontend.py b/mopidy/mpd/frontend.py index 2d8c783d..58699a5b 100644 --- a/mopidy/mpd/frontend.py +++ b/mopidy/mpd/frontend.py @@ -1248,7 +1248,7 @@ class MpdFrontend(object): @handle_pattern(r'^noidle$') def _status_noidle(self): """See :meth:`_status_idle`.""" - raise MpdNotImplemented # TODO + pass # TODO @handle_pattern(r'^stats$') def _status_stats(self): diff --git a/tests/mpd/frontend_test.py b/tests/mpd/frontend_test.py index 5ed4242a..932d6d9a 100644 --- a/tests/mpd/frontend_test.py +++ b/tests/mpd/frontend_test.py @@ -146,7 +146,7 @@ class StatusHandlerTest(unittest.TestCase): def test_noidle(self): result = self.h.handle_request(u'noidle') - self.assert_(u'ACK [0@0] {} Not implemented' in result) + self.assert_(u'OK' in result) def test_stats_command(self): result = self.h.handle_request(u'stats') From 22f011d57f708af49ec3fd5f51281c390021a0d3 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Wed, 30 Jun 2010 20:18:22 +0200 Subject: [PATCH 3/7] MPD: Use AF_INET instead of AF_INET6 if the host does not have IPv6 support --- mopidy/mpd/server.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mopidy/mpd/server.py b/mopidy/mpd/server.py index 83e4efde..f67956e1 100644 --- a/mopidy/mpd/server.py +++ b/mopidy/mpd/server.py @@ -32,7 +32,11 @@ class MpdServer(asyncore.dispatcher): def start(self): try: - self.create_socket(socket.AF_INET6, socket.SOCK_STREAM) + if socket.has_ipv6: + protocol_family = socket.AF_INET6 + else: + protocol_family = socket.AF_INET + self.create_socket(protocol_family, socket.SOCK_STREAM) self.set_reuse_addr() self.bind((self._format_hostname(settings.SERVER_HOSTNAME), settings.SERVER_PORT)) From 699385b61369a3a900301598f2b5a23e208b4fe4 Mon Sep 17 00:00:00 2001 From: Kristian Klette Date: Wed, 30 Jun 2010 20:40:20 +0200 Subject: [PATCH 4/7] Support list album artist "someartist" --- mopidy/mpd/frontend.py | 6 +++--- tests/mpd/frontend_test.py | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mopidy/mpd/frontend.py b/mopidy/mpd/frontend.py index 58699a5b..99c449d2 100644 --- a/mopidy/mpd/frontend.py +++ b/mopidy/mpd/frontend.py @@ -642,8 +642,8 @@ class MpdFrontend(object): @handle_pattern(r'^list (?P[Aa]rtist)$') @handle_pattern(r'^list "(?P[Aa]rtist)"$') - @handle_pattern(r'^list (?Palbum)( "(?P[^"]+)")*$') - @handle_pattern(r'^list "(?Palbum)"( "(?P[^"]+)")*$') + @handle_pattern(r'^list (?Palbum( artist)?)( "(?P[^"]+)")*$') + @handle_pattern(r'^list "(?Palbum(" "artist)?)"( "(?P[^"]+)")*$') def _music_db_list(self, field, artist=None): """ *musicpd.org, music database section:* @@ -669,7 +669,7 @@ class MpdFrontend(object): - capitalizes the field argument. """ field = field.lower() - # TODO + pass # TODO @handle_pattern(r'^listall "(?P[^"]+)"') def _music_db_listall(self, uri): diff --git a/tests/mpd/frontend_test.py b/tests/mpd/frontend_test.py index 932d6d9a..10950ccb 100644 --- a/tests/mpd/frontend_test.py +++ b/tests/mpd/frontend_test.py @@ -1017,6 +1017,10 @@ class MusicDatabaseHandlerTest(unittest.TestCase): def test_list_album_with_artist(self): result = self.h.handle_request(u'list "album" "anartist"') self.assert_(u'OK' in result) + + def test_list_album_artist_with_artist_without_quotes(self): + result = self.h.handle_request(u'list album artist "anartist"') + self.assert_(u'OK' in result) def test_listall(self): result = self.h.handle_request(u'listall "file:///dev/urandom"') From 61ac0e5e01cc131c5c8114db07e3fc4cd508c0ea Mon Sep 17 00:00:00 2001 From: Kristian Klette Date: Wed, 30 Jun 2010 20:40:57 +0200 Subject: [PATCH 5/7] Add example for list album artist "someartist" to doc --- mopidy/mpd/frontend.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mopidy/mpd/frontend.py b/mopidy/mpd/frontend.py index 99c449d2..db0e7183 100644 --- a/mopidy/mpd/frontend.py +++ b/mopidy/mpd/frontend.py @@ -663,6 +663,14 @@ class MpdFrontend(object): list album artist "an artist name" + returns the albums available for the asked artist:: + + list album artist "Tiesto" + Album: Radio Trance Vol 4-Promo-CD + Album: Ur A Tear in the Open CDR + Album: Simple Trance 2004 Step One + Album: In Concert 05-10-2003 + *ncmpc:* - does not add quotes around the field argument. From 5916646eca21dc3cc69fb79e5b5fe4e8b274c820 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Wed, 30 Jun 2010 21:49:48 +0200 Subject: [PATCH 6/7] Format IP address to bind to according to available protocol family --- mopidy/mpd/server.py | 14 ++++++++------ tests/mpd/server_test.py | 13 +++++++++---- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/mopidy/mpd/server.py b/mopidy/mpd/server.py index f67956e1..4dc8058e 100644 --- a/mopidy/mpd/server.py +++ b/mopidy/mpd/server.py @@ -33,13 +33,14 @@ class MpdServer(asyncore.dispatcher): def start(self): try: if socket.has_ipv6: - protocol_family = socket.AF_INET6 + self.create_socket(socket.AF_INET6, socket.SOCK_STREAM) else: - protocol_family = socket.AF_INET - self.create_socket(protocol_family, socket.SOCK_STREAM) + self.create_socket(socket.AF_INET, socket.SOCK_STREAM) self.set_reuse_addr() - self.bind((self._format_hostname(settings.SERVER_HOSTNAME), - settings.SERVER_PORT)) + hostname = self._format_hostname(settings.SERVER_HOSTNAME) + port = settings.SERVER_PORT + logger.debug(u'Binding to [%s]:%s', hostname, port) + self.bind((hostname, port)) self.listen(1) logger.info(u'MPD server running at [%s]:%s', self._format_hostname(settings.SERVER_HOSTNAME), @@ -58,7 +59,8 @@ class MpdServer(asyncore.dispatcher): self.close() def _format_hostname(self, hostname): - if re.match('\d+.\d+.\d+.\d+', hostname) is not None: + if (socket.has_ipv6 + and re.match('\d+.\d+.\d+.\d+', hostname) is not None): hostname = '::ffff:%s' % hostname return hostname diff --git a/tests/mpd/server_test.py b/tests/mpd/server_test.py index 7c290095..e1612c1d 100644 --- a/tests/mpd/server_test.py +++ b/tests/mpd/server_test.py @@ -1,20 +1,25 @@ import unittest -from mopidy.mpd.server import MpdServer, MpdSession +from mopidy.mpd import server class MpdServerTest(unittest.TestCase): def setUp(self): - self.server = MpdServer(None) + self.server = server.MpdServer(None) - def test_format_hostname_prefixes_ipv4_addresses(self): + def test_format_hostname_prefixes_ipv4_addresses_when_ipv6_available(self): + server.socket.has_ipv6 = True self.assertEqual(self.server._format_hostname('0.0.0.0'), '::ffff:0.0.0.0') self.assertEqual(self.server._format_hostname('127.0.0.1'), '::ffff:127.0.0.1') + def test_format_hostname_does_nothing_when_only_ipv4_available(self): + server.socket.has_ipv6 = False + self.assertEquals(self.server._format_hostname('0.0.0.0'), '0.0.0.0') + class MpdSessionTest(unittest.TestCase): def setUp(self): - self.session = MpdSession(None, None, (None, None), None) + self.session = server.MpdSession(None, None, (None, None), None) def test_found_terminator_catches_decode_error(self): # Pressing Ctrl+C in a telnet session sends a 0xff byte to the server. From 730ca2648c0968d1e1fb2e6fcb26a0c0058ba37b Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Thu, 1 Jul 2010 01:02:39 +0200 Subject: [PATCH 7/7] Remove duplicate method --- mopidy/backends/__init__.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mopidy/backends/__init__.py b/mopidy/backends/__init__.py index 9b08250b..9e0bff7a 100644 --- a/mopidy/backends/__init__.py +++ b/mopidy/backends/__init__.py @@ -241,10 +241,6 @@ class BaseCurrentPlaylistController(object): random.shuffle(shuffled) self.playlist = self.playlist.with_(tracks=before+shuffled+after) - def destroy(self): - """Cleanup after component.""" - pass - class BaseLibraryController(object): """