From 9ce6a155af626e0e207da45312a9ce0104cdc42d Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 1 Nov 2011 08:44:57 +0100 Subject: [PATCH 1/7] Only logout if we have a session to log out from --- mopidy/backends/spotify/session_manager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mopidy/backends/spotify/session_manager.py b/mopidy/backends/spotify/session_manager.py index aeb33b91..711c924b 100644 --- a/mopidy/backends/spotify/session_manager.py +++ b/mopidy/backends/spotify/session_manager.py @@ -164,4 +164,5 @@ class SpotifySessionManager(BaseThread, PyspotifySessionManager): def logout(self): """Log out from spotify""" logger.debug(u'Logging out from Spotify') - self.session.logout() + if self.session: + self.session.logout() From 98756d837e85ba03b1d72d344ff25419da92fd2c Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 1 Nov 2011 08:46:06 +0100 Subject: [PATCH 2/7] Replace loop and filter with more Pythonic list comprehension --- mopidy/backends/spotify/session_manager.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mopidy/backends/spotify/session_manager.py b/mopidy/backends/spotify/session_manager.py index 711c924b..f9ff083b 100644 --- a/mopidy/backends/spotify/session_manager.py +++ b/mopidy/backends/spotify/session_manager.py @@ -139,11 +139,11 @@ class SpotifySessionManager(BaseThread, PyspotifySessionManager): def refresh_stored_playlists(self): """Refresh the stored playlists in the backend with fresh meta data from Spotify""" - playlists = [] - for spotify_playlist in self.session.playlist_container(): - playlists.append( - SpotifyTranslator.to_mopidy_playlist(spotify_playlist)) - playlists = filter(None, playlists) + playlists = [playlist + for playlist in + [SpotifyTranslator.to_mopidy_playlist(spotify_playlist) + for spotify_playlist in self.session.playlist_container()] + if playlist is not None] self.backend.stored_playlists.playlists = playlists logger.debug(u'Refreshed %d stored playlist(s)', len(playlists)) From ce4e681e7b03629f147e0cd8562e171a0b045a30 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 1 Nov 2011 08:46:43 +0100 Subject: [PATCH 3/7] Use new method in playlists to check if they are playlists or folder boundaries --- mopidy/backends/spotify/translator.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mopidy/backends/spotify/translator.py b/mopidy/backends/spotify/translator.py index 95287d77..cc72aecd 100644 --- a/mopidy/backends/spotify/translator.py +++ b/mopidy/backends/spotify/translator.py @@ -51,9 +51,8 @@ class SpotifyTranslator(object): def to_mopidy_playlist(cls, spotify_playlist): if not spotify_playlist.is_loaded(): return Playlist(name=u'[loading...]') - # FIXME Replace this try-except with a check on the playlist type, - # which is currently not supported by pyspotify, to avoid handling - # playlist folder boundaries like normal playlists. + if spotify_playlist.type() != 'playlist': + return try: return Playlist( uri=str(Link.from_playlist(spotify_playlist)), @@ -63,5 +62,4 @@ class SpotifyTranslator(object): if str(Link.from_track(t, 0))], ) except SpotifyError, e: - logger.info(u'Failed translating Spotify playlist ' - '(probably a playlist folder boundary): %s', e) + logger.warning(u'Failed translating Spotify playlist: %s', e) From 5c194b9c378ec3fc9f3bcb34d1915fa5f86d5735 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 1 Nov 2011 08:47:37 +0100 Subject: [PATCH 4/7] Watching for changes to PlaylistFolder objects doesn't work --- mopidy/backends/spotify/container_manager.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mopidy/backends/spotify/container_manager.py b/mopidy/backends/spotify/container_manager.py index 520cfb68..deabc7d2 100644 --- a/mopidy/backends/spotify/container_manager.py +++ b/mopidy/backends/spotify/container_manager.py @@ -13,13 +13,15 @@ class SpotifyContainerManager(PyspotifyContainerManager): def container_loaded(self, container, userdata): """Callback used by pyspotify""" logger.debug(u'Callback called: playlist container loaded') + self.session_manager.refresh_stored_playlists() - playlist_container = self.session_manager.session.playlist_container() - for playlist in playlist_container: + playlists = [playlist + for playlist in self.session_manager.session.playlist_container() + if playlist.type() == 'playlist'] + for playlist in playlists: self.session_manager.playlist_manager.watch(playlist) - logger.debug(u'Watching %d playlist(s) for changes', - len(playlist_container)) + logger.debug(u'Watching %d playlist(s) for changes', len(playlists)) def playlist_added(self, container, playlist, position, userdata): """Callback used by pyspotify""" From f0f10e43749fb79523bc280328099cb0aa92caad Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 1 Nov 2011 18:27:07 +0100 Subject: [PATCH 5/7] Refactor from for-if-for to just for-if --- mopidy/backends/spotify/container_manager.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mopidy/backends/spotify/container_manager.py b/mopidy/backends/spotify/container_manager.py index deabc7d2..3ff11072 100644 --- a/mopidy/backends/spotify/container_manager.py +++ b/mopidy/backends/spotify/container_manager.py @@ -16,11 +16,9 @@ class SpotifyContainerManager(PyspotifyContainerManager): self.session_manager.refresh_stored_playlists() - playlists = [playlist - for playlist in self.session_manager.session.playlist_container() - if playlist.type() == 'playlist'] - for playlist in playlists: - self.session_manager.playlist_manager.watch(playlist) + for playlist in self.session_manager.session.playlist_container(): + if playlist.type() == 'playlist': + self.session_manager.playlist_manager.watch(playlist) logger.debug(u'Watching %d playlist(s) for changes', len(playlists)) def playlist_added(self, container, playlist, position, userdata): From 7fa46f1aced86e490c0e2f87f6bf84542ca2a3f2 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 1 Nov 2011 18:35:34 +0100 Subject: [PATCH 6/7] Refactor from nested list comprehensions to map/filter --- mopidy/backends/spotify/session_manager.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mopidy/backends/spotify/session_manager.py b/mopidy/backends/spotify/session_manager.py index f9ff083b..4b81db1f 100644 --- a/mopidy/backends/spotify/session_manager.py +++ b/mopidy/backends/spotify/session_manager.py @@ -139,11 +139,9 @@ class SpotifySessionManager(BaseThread, PyspotifySessionManager): def refresh_stored_playlists(self): """Refresh the stored playlists in the backend with fresh meta data from Spotify""" - playlists = [playlist - for playlist in - [SpotifyTranslator.to_mopidy_playlist(spotify_playlist) - for spotify_playlist in self.session.playlist_container()] - if playlist is not None] + playlists = map(SpotifyTranslator.to_mopidy_playlist, + self.session.playlist_container()) + playlists = filter(None, playlists) self.backend.stored_playlists.playlists = playlists logger.debug(u'Refreshed %d stored playlist(s)', len(playlists)) From f8ac134d48fb525533340493a2d89e4dd079171e Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 1 Nov 2011 18:38:34 +0100 Subject: [PATCH 7/7] We still need the number of watched playlists for the log --- mopidy/backends/spotify/container_manager.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mopidy/backends/spotify/container_manager.py b/mopidy/backends/spotify/container_manager.py index 3ff11072..27a4d78a 100644 --- a/mopidy/backends/spotify/container_manager.py +++ b/mopidy/backends/spotify/container_manager.py @@ -16,10 +16,12 @@ class SpotifyContainerManager(PyspotifyContainerManager): self.session_manager.refresh_stored_playlists() + count = 0 for playlist in self.session_manager.session.playlist_container(): if playlist.type() == 'playlist': self.session_manager.playlist_manager.watch(playlist) - logger.debug(u'Watching %d playlist(s) for changes', len(playlists)) + count += 1 + logger.debug(u'Watching %d playlist(s) for changes', count) def playlist_added(self, container, playlist, position, userdata): """Callback used by pyspotify"""