From 230c3af3cb9736db15d2f29e6aeca3de79a07cb2 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 31 Jan 2010 13:03:50 +0100 Subject: [PATCH] Move MPD stuff to mopidy.mpd --- mopidy/__main__.py | 2 +- mopidy/mpd/__init__.py | 0 mopidy/{ => mpd}/handler.py | 2 +- mopidy/{ => mpd}/server.py | 4 ++-- mopidy/{ => mpd}/session.py | 4 ++-- tests/__main__.py | 2 +- tests/{ => mpd}/handlertest.py | 26 +++++++++++++------------- 7 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 mopidy/mpd/__init__.py rename mopidy/{ => mpd}/handler.py (99%) rename mopidy/{ => mpd}/server.py (93%) rename mopidy/{ => mpd}/session.py (96%) rename tests/{ => mpd}/handlertest.py (96%) diff --git a/mopidy/__main__.py b/mopidy/__main__.py index 6844d190..8bc79f63 100644 --- a/mopidy/__main__.py +++ b/mopidy/__main__.py @@ -8,7 +8,7 @@ sys.path.insert(0, from mopidy import config from mopidy.exceptions import ConfigError -from mopidy.server import MpdServer +from mopidy.mpd.server import MpdServer from mopidy.backends.libspotify import LibspotifyBackend def main(): diff --git a/mopidy/mpd/__init__.py b/mopidy/mpd/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/mopidy/handler.py b/mopidy/mpd/handler.py similarity index 99% rename from mopidy/handler.py rename to mopidy/mpd/handler.py index cc97bd0d..848caecf 100644 --- a/mopidy/handler.py +++ b/mopidy/mpd/handler.py @@ -5,7 +5,7 @@ import sys from mopidy import settings from mopidy.exceptions import MpdAckError, MpdNotImplemented -logger = logging.getLogger('mpdhandler') +logger = logging.getLogger('mpd.handler') _request_handlers = {} diff --git a/mopidy/server.py b/mopidy/mpd/server.py similarity index 93% rename from mopidy/server.py rename to mopidy/mpd/server.py index aafbd3a7..dff365ec 100644 --- a/mopidy/server.py +++ b/mopidy/mpd/server.py @@ -5,9 +5,9 @@ import sys import time from mopidy import config -from mopidy.session import MpdSession +from mopidy.mpd.session import MpdSession -logger = logging.getLogger(u'mpdserver') +logger = logging.getLogger(u'mpd.server') class MpdServer(asyncore.dispatcher): def __init__(self, session_class=MpdSession, backend=None): diff --git a/mopidy/session.py b/mopidy/mpd/session.py similarity index 96% rename from mopidy/session.py rename to mopidy/mpd/session.py index e4f9691a..edd2a95c 100644 --- a/mopidy/session.py +++ b/mopidy/mpd/session.py @@ -3,9 +3,9 @@ import logging from mopidy import get_mpd_protocol_version, config from mopidy.exceptions import MpdAckError -from mopidy.handler import MpdHandler +from mopidy.mpd.handler import MpdHandler -logger = logging.getLogger(u'mpdsession') +logger = logging.getLogger(u'mpd.session') def indent(string, places=4, linebreak=config.MPD_LINE_TERMINATOR): lines = string.split(linebreak) diff --git a/tests/__main__.py b/tests/__main__.py index df7e2187..86c814ac 100644 --- a/tests/__main__.py +++ b/tests/__main__.py @@ -9,7 +9,7 @@ def main(): sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../'))) r = CoverageTestRunner() - r.add_pair('mopidy/handler.py', 'tests/handlertest.py') + r.add_pair('mopidy/mpd/handler.py', 'tests/mpd/handlertest.py') r.run() if __name__ == '__main__': diff --git a/tests/handlertest.py b/tests/mpd/handlertest.py similarity index 96% rename from tests/handlertest.py rename to tests/mpd/handlertest.py index 5f55511b..aaf56941 100644 --- a/tests/handlertest.py +++ b/tests/mpd/handlertest.py @@ -1,8 +1,8 @@ import unittest -from mopidy import handler from mopidy.backends.dummy import DummyBackend from mopidy.exceptions import MpdAckError +from mopidy.mpd.handler import MpdHandler class DummySession(object): def do_close(self): @@ -17,7 +17,7 @@ class DummySession(object): class RequestHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler(backend=DummyBackend()) + self.h = MpdHandler(backend=DummyBackend()) def test_register_same_pattern_twice_fails(self): func = lambda: None @@ -44,7 +44,7 @@ class RequestHandlerTest(unittest.TestCase): class CommandListsTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler(backend=DummyBackend()) + self.h = MpdHandler(backend=DummyBackend()) def test_command_list_begin(self): result = self.h.handle_request(u'command_list_begin') @@ -86,7 +86,7 @@ class StatusHandlerTest(unittest.TestCase): def setUp(self): self.b = DummyBackend() self.s = DummySession() - self.h = handler.MpdHandler(backend=self.b, session=self.s) + self.h = MpdHandler(backend=self.b, session=self.s) def test_clearerror(self): result = self.h.handle_request(u'clearerror') @@ -170,7 +170,7 @@ class StatusHandlerTest(unittest.TestCase): class PlaybackOptionsHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler(backend=DummyBackend()) + self.h = MpdHandler(backend=DummyBackend()) def test_consume_off(self): result = self.h.handle_request(u'consume "0"') @@ -271,7 +271,7 @@ class PlaybackOptionsHandlerTest(unittest.TestCase): class PlaybackControlHandlerTest(unittest.TestCase): def setUp(self): self.b = DummyBackend() - self.h = handler.MpdHandler(backend=self.b) + self.h = MpdHandler(backend=self.b) def test_next(self): result = self.h.handle_request(u'next') @@ -325,7 +325,7 @@ class PlaybackControlHandlerTest(unittest.TestCase): class CurrentPlaylistHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler(backend=DummyBackend()) + self.h = MpdHandler(backend=DummyBackend()) def test_add(self): result = self.h.handle_request(u'add "file:///dev/urandom"') @@ -443,7 +443,7 @@ class CurrentPlaylistHandlerTest(unittest.TestCase): class StoredPlaylistsHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler(backend=DummyBackend()) + self.h = MpdHandler(backend=DummyBackend()) def test_listplaylist(self): result = self.h.handle_request(u'listplaylist "name"') @@ -493,7 +493,7 @@ class StoredPlaylistsHandlerTest(unittest.TestCase): class MusicDatabaseHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler(backend=DummyBackend()) + self.h = MpdHandler(backend=DummyBackend()) def test_count(self): result = self.h.handle_request(u'count "tag" "needle"') @@ -609,14 +609,14 @@ class MusicDatabaseHandlerTest(unittest.TestCase): class StickersHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler(backend=DummyBackend()) + self.h = MpdHandler(backend=DummyBackend()) pass # TODO class ConnectionHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler(session=DummySession(), + self.h = MpdHandler(session=DummySession(), backend=DummyBackend()) def test_close(self): @@ -641,14 +641,14 @@ class ConnectionHandlerTest(unittest.TestCase): class AudioOutputHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler(backend=DummyBackend()) + self.h = MpdHandler(backend=DummyBackend()) pass # TODO class ReflectionHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler(backend=DummyBackend()) + self.h = MpdHandler(backend=DummyBackend()) def test_urlhandlers(self): result = self.h.handle_request(u'urlhandlers')