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

Move backend initialization from MpdServer to main()

Browse Source
This commit is contained in:
Stein Magnus Jodal 2009-12-25 17:21:17 +01:00
parent c5f6c4c2a6
commit 81f7c4969b
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mopidy/__main__.py
View File

@ -8,10 +8,12 @@ sys.path.insert(0,
from mopidy import settings from mopidy import settings
from mopidy.server import MpdServer from mopidy.server import MpdServer
from mopidy.backends.spotify import SpotifyBackend
def main(): def main():
_setup_logging(2) _setup_logging(2)
MpdServer() backend = SpotifyBackend()
MpdServer(backend=backend)
print 'Please connect to %s port %s using a MPD client.' % ( print 'Please connect to %s port %s using a MPD client.' % (
settings.MPD_SERVER_HOSTNAME, settings.MPD_SERVER_PORT) settings.MPD_SERVER_HOSTNAME, settings.MPD_SERVER_PORT)
asyncore.loop() asyncore.loop()

6
mopidy/backends/spotify.py
View File

@ -1,3 +1,4 @@
import logging
import sys import sys
import spytify import spytify
@ -5,10 +6,15 @@ import spytify
from mopidy import settings from mopidy import settings
from mopidy.backends.base import BaseBackend from mopidy.backends.base import BaseBackend
logger = logging.getLogger('spotify')
class SpotifyBackend(BaseBackend): class SpotifyBackend(BaseBackend):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(SpotifyBackend, self).__init__(*args, **kwargs) super(SpotifyBackend, self).__init__(*args, **kwargs)
logger.debug('Signing in')
self.spotify = spytify.Spytify(self.username, self.password) self.spotify = spytify.Spytify(self.username, self.password)
self._playlist_load_cache = None self._playlist_load_cache = None
self.current_playlist = [] self.current_playlist = []
self.current_playlist_version = 0 self.current_playlist_version = 0

5
mopidy/server.py
View File

@ -5,15 +5,14 @@ import sys
from mopidy import settings from mopidy import settings
from mopidy.session import MpdSession from mopidy.session import MpdSession
from mopidy.backends.spotify import SpotifyBackend
logger = logging.getLogger(u'server') logger = logging.getLogger(u'server')
class MpdServer(asyncore.dispatcher): class MpdServer(asyncore.dispatcher):
def __init__(self, session_class=MpdSession, backend=SpotifyBackend): def __init__(self, session_class=MpdSession, backend=None):
asyncore.dispatcher.__init__(self) asyncore.dispatcher.__init__(self)
self.session_class = session_class self.session_class = session_class
self.backend = SpotifyBackend() self.backend = backend
self.create_socket(socket.AF_INET, socket.SOCK_STREAM) self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
self.set_reuse_addr() self.set_reuse_addr()
self.bind((settings.MPD_SERVER_HOSTNAME, settings.MPD_SERVER_PORT)) self.bind((settings.MPD_SERVER_HOSTNAME, settings.MPD_SERVER_PORT))