diff --git a/mopidy/__main__.py b/mopidy/__main__.py index 4d45eab1..6d0bb36a 100644 --- a/mopidy/__main__.py +++ b/mopidy/__main__.py @@ -8,10 +8,12 @@ sys.path.insert(0, from mopidy import settings from mopidy.server import MpdServer +from mopidy.backends.spotify import SpotifyBackend def main(): _setup_logging(2) - MpdServer() + backend = SpotifyBackend() + MpdServer(backend=backend) print 'Please connect to %s port %s using a MPD client.' % ( settings.MPD_SERVER_HOSTNAME, settings.MPD_SERVER_PORT) asyncore.loop() diff --git a/mopidy/backends/spotify.py b/mopidy/backends/spotify.py index 204e1c01..4ee0ad27 100644 --- a/mopidy/backends/spotify.py +++ b/mopidy/backends/spotify.py @@ -1,3 +1,4 @@ +import logging import sys import spytify @@ -5,10 +6,15 @@ import spytify from mopidy import settings from mopidy.backends.base import BaseBackend +logger = logging.getLogger('spotify') + class SpotifyBackend(BaseBackend): def __init__(self, *args, **kwargs): super(SpotifyBackend, self).__init__(*args, **kwargs) + + logger.debug('Signing in') self.spotify = spytify.Spytify(self.username, self.password) + self._playlist_load_cache = None self.current_playlist = [] self.current_playlist_version = 0 diff --git a/mopidy/server.py b/mopidy/server.py index 2d07d51e..9b3b9a35 100644 --- a/mopidy/server.py +++ b/mopidy/server.py @@ -5,15 +5,14 @@ import sys from mopidy import settings from mopidy.session import MpdSession -from mopidy.backends.spotify import SpotifyBackend logger = logging.getLogger(u'server') class MpdServer(asyncore.dispatcher): - def __init__(self, session_class=MpdSession, backend=SpotifyBackend): + def __init__(self, session_class=MpdSession, backend=None): asyncore.dispatcher.__init__(self) self.session_class = session_class - self.backend = SpotifyBackend() + self.backend = backend self.create_socket(socket.AF_INET, socket.SOCK_STREAM) self.set_reuse_addr() self.bind((settings.MPD_SERVER_HOSTNAME, settings.MPD_SERVER_PORT))