andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move MPD stuff to mopidy.mpd

Browse Source
This commit is contained in:
Stein Magnus Jodal 2010-01-31 13:03:50 +01:00
parent e97a673a5d
commit 230c3af3cb
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mopidy/__main__.py
View File

@ -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():

0
mopidy/mpd/__init__.py Normal file
View File

2
mopidy/handler.py → mopidy/mpd/handler.py
View File

@ -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 = {}

4
mopidy/server.py → mopidy/mpd/server.py
View File

@ -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):

4
mopidy/session.py → mopidy/mpd/session.py
View File

@ -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)

2
tests/__main__.py
View File

@ -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__':

26
tests/handlertest.py → tests/mpd/handlertest.py
View File

@ -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')