From 5dd67fa7a762e7be2ab351d4185578336d94e44c Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Thu, 27 Sep 2012 02:10:03 +0200 Subject: [PATCH] Remove reverse dependency on the stored playlists controller --- mopidy/backends/spotify/__init__.py | 4 ++-- mopidy/backends/spotify/library.py | 2 +- mopidy/backends/spotify/session_manager.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mopidy/backends/spotify/__init__.py b/mopidy/backends/spotify/__init__.py index d41c70b4..4320d723 100644 --- a/mopidy/backends/spotify/__init__.py +++ b/mopidy/backends/spotify/__init__.py @@ -58,10 +58,10 @@ class SpotifyBackend(ThreadingActor, base.Backend): self.playback = core.PlaybackController(backend=self, provider=playback_provider) - stored_playlists_provider = SpotifyStoredPlaylistsProvider( + self.stored_playlists_provider = SpotifyStoredPlaylistsProvider( backend=self) self.stored_playlists = core.StoredPlaylistsController(backend=self, - provider=stored_playlists_provider) + provider=self.stored_playlists_provider) self.uri_schemes = [u'spotify'] diff --git a/mopidy/backends/spotify/library.py b/mopidy/backends/spotify/library.py index 18276ecd..3931aece 100644 --- a/mopidy/backends/spotify/library.py +++ b/mopidy/backends/spotify/library.py @@ -66,7 +66,7 @@ class SpotifyLibraryProvider(BaseLibraryProvider): # Since we can't search for the entire Spotify library, we return # all tracks in the stored playlists when the query is empty. tracks = [] - for playlist in self.backend.stored_playlists.playlists: + for playlist in self.backend.stored_playlists_provider.playlists: tracks += playlist.tracks return Playlist(tracks=tracks) spotify_query = [] diff --git a/mopidy/backends/spotify/session_manager.py b/mopidy/backends/spotify/session_manager.py index 9fb6adcb..577d48c9 100644 --- a/mopidy/backends/spotify/session_manager.py +++ b/mopidy/backends/spotify/session_manager.py @@ -139,7 +139,7 @@ class SpotifySessionManager(BaseThread, PyspotifySessionManager): playlists = map(SpotifyTranslator.to_mopidy_playlist, self.session.playlist_container()) playlists = filter(None, playlists) - self.backend.stored_playlists.playlists = playlists + self.backend.stored_playlists_provider.playlists = playlists logger.info(u'Loaded %d Spotify playlist(s)', len(playlists)) def search(self, query, queue):