Release v2.0.1

Author: jodal

README.rst

@@ -139,6 +139,14 @@ Project resources
 Changelog
 =========
 
+v2.0.1 (2015-08-23)
+-------------------
+
+Bug fix release.
+
+- Filter out ``None`` from ``library.get_distinct()`` return values. (Fixes:
+  #63)
+
 v2.0.0 (2015-08-11)
 -------------------
 

mopidy_spotify/__init__.py

@@ -5,7 +5,7 @@
 from mopidy import config, ext
 
 
-__version__ = '2.0.0'
+__version__ = '2.0.1'
 
 
 class Extension(ext.Extension):

mopidy_spotify/distinct.py

@@ -18,15 +18,17 @@ def get_distinct(config, session, field, query=None):
     sp_query = translator.sp_search_query(query) if query else None
 
     if field == 'artist':
-        return _get_distinct_artists(config, session, sp_query)
+        result = _get_distinct_artists(config, session, sp_query)
     elif field == 'albumartist':
-        return _get_distinct_albumartists(config, session, sp_query)
+        result = _get_distinct_albumartists(config, session, sp_query)
     elif field == 'album':
-        return _get_distinct_albums(config, session, sp_query)
+        result = _get_distinct_albums(config, session, sp_query)
     elif field == 'date':
-        return _get_distinct_dates(config, session, sp_query)
+        result = _get_distinct_dates(config, session, sp_query)
     else:
-        return set()
+        result = set()
+
+    return result - {None}
 
 
 def _get_distinct_artists(config, session, sp_query):
@@ -50,11 +52,15 @@ def _get_distinct_albumartists(config, session, sp_query):
         sp_search = _get_sp_search(config, session, sp_query, album=True)
         if sp_search is None:
             return set()
-        return {album.artist.name for album in sp_search.albums}
+        return {
+            album.artist.name
+            for album in sp_search.albums
+            if album.artist}
     else:
         return {
             track.album.artist.name
-            for track in _get_playlist_tracks(config, session)}
+            for track in _get_playlist_tracks(config, session)
+            if track.album and track.album.artist}
 
 
 def _get_distinct_albums(config, session, sp_query):
@@ -67,7 +73,8 @@ def _get_distinct_albums(config, session, sp_query):
     else:
         return {
             track.album.name
-            for track in _get_playlist_tracks(config, session)}
+            for track in _get_playlist_tracks(config, session)
+            if track.album}
 
 
 def _get_distinct_dates(config, session, sp_query):
@@ -79,12 +86,12 @@ def _get_distinct_dates(config, session, sp_query):
         return {
             '%s' % album.year
             for album in sp_search.albums
-            if album.year != 0}
+            if album.year not in (None, 0)}
     else:
         return {
             '%s' % track.album.year
             for track in _get_playlist_tracks(config, session)
-            if track.album.year != 0}
+            if track.album and track.album.year not in (None, 0)}
 
 
 def _get_sp_search(

tests/conftest.py

@@ -66,6 +66,21 @@ def sp_artist_mock():
     return sp_artist
 
 
+@pytest.fixture
+def sp_unloaded_artist_mock():
+    sp_artist = mock.Mock(spec=spotify.Artist)
+    sp_artist.is_loaded = False
+    sp_artist.name = None
+
+    sp_link = mock.Mock(spec=spotify.Link)
+    sp_link.uri = 'spotify:artist:abba'
+    sp_link.type = spotify.LinkType.ARTIST
+    sp_link.as_artist.return_value = sp_artist
+    sp_artist.link = sp_link
+
+    return sp_artist
+
+
 @pytest.fixture
 def sp_artist_browser_mock(sp_artist_mock, sp_album_mock):
     sp_artist_browser = mock.Mock(spec=spotify.ArtistBrowser)
@@ -94,6 +109,25 @@ def sp_album_mock(sp_artist_mock):
     return sp_album
 
 
+@pytest.fixture
+def sp_unloaded_album_mock(sp_unloaded_artist_mock):
+    sp_album = mock.Mock(spec=spotify.Album)
+    sp_album.is_loaded = True
+    sp_album.is_loaded = False
+    sp_album.name = None
+    # Optimally, we should test with both None and sp_unloaded_artist_mock
+    sp_album.artist = sp_unloaded_artist_mock
+    sp_album.year = None
+
+    sp_link = mock.Mock(spec=spotify.Link)
+    sp_link.uri = 'spotify:album:def'
+    sp_link.type = spotify.LinkType.ALBUM
+    sp_link.as_album.return_value = sp_album
+    sp_album.link = sp_link
+
+    return sp_album
+
+
 @pytest.fixture
 def sp_album_browser_mock(sp_album_mock, sp_track_mock):
     sp_album_browser = mock.Mock(spec=spotify.AlbumBrowser)
@@ -128,6 +162,30 @@ def sp_track_mock(sp_artist_mock, sp_album_mock):
     return sp_track
 
 
+@pytest.fixture
+def sp_unloaded_track_mock(sp_unloaded_artist_mock, sp_unloaded_album_mock):
+    sp_track = mock.Mock(spec=spotify.Track)
+    sp_track.is_loaded = False
+    sp_track.error = spotify.ErrorType.OK
+    sp_track.availability = None
+    sp_track.name = None
+    # Optimally, we should test with both None and [sp_unloaded_artist_mock]
+    sp_track.artists = [sp_unloaded_artist_mock]
+    # Optimally, we should test with both None and sp_unloaded_album_mock
+    sp_track.album = sp_unloaded_album_mock
+    sp_track.duration = None
+    sp_track.disc = None
+    sp_track.index = None
+
+    sp_link = mock.Mock(spec=spotify.Link)
+    sp_link.uri = 'spotify:track:abc'
+    sp_link.type = spotify.LinkType.TRACK
+    sp_link.as_track.return_value = sp_track
+    sp_track.link = sp_link
+
+    return sp_track
+
+
 @pytest.fixture
 def sp_starred_mock(sp_user_mock, sp_artist_mock, sp_album_mock):
     sp_track1 = sp_track_mock(sp_artist_mock, sp_album_mock)
@@ -170,6 +228,24 @@ def sp_playlist_mock(sp_user_mock, sp_track_mock):
     return sp_playlist
 
 
+@pytest.fixture
+def sp_unloaded_playlist_mock(sp_unloaded_track_mock):
+    sp_playlist = mock.Mock(spec=spotify.Playlist)
+    sp_playlist.is_loaded = False
+    sp_playlist.owner = None
+    sp_playlist.name = None
+    # Optimally, we should test with both None and [sp_unloaded_track_mock]
+    sp_playlist.tracks = [sp_unloaded_track_mock]
+
+    sp_link = mock.Mock(spec=spotify.Link)
+    sp_link.uri = 'spotify:user:alice:playlist:foo'
+    sp_link.type = spotify.LinkType.PLAYLIST
+    sp_link.as_playlist.return_value = sp_playlist
+    sp_playlist.link = sp_link
+
+    return sp_playlist
+
+
 @pytest.fixture
 def sp_playlist_folder_start_mock():
     sp_playlist_folder_start = mock.Mock(spec=spotify.PlaylistFolder)

tests/test_distinct.py

@@ -7,22 +7,29 @@
 
 @pytest.fixture
 def session_mock_with_playlists(
-        session_mock, sp_playlist_mock,
+        session_mock, sp_playlist_mock, sp_unloaded_playlist_mock,
         sp_playlist_folder_start_mock, sp_playlist_folder_end_mock):
 
     session_mock.playlist_container = [
         sp_playlist_folder_start_mock,
         sp_playlist_mock,
+        sp_unloaded_playlist_mock,
         sp_playlist_folder_end_mock,
     ]
     return session_mock
 
 
 @pytest.fixture
-def session_mock_with_search(session_mock, sp_album_mock, sp_artist_mock):
+def session_mock_with_search(
+        session_mock,
+        sp_album_mock, sp_unloaded_album_mock,
+        sp_artist_mock, sp_unloaded_artist_mock):
+
     session_mock.connection.state = spotify.ConnectionState.LOGGED_IN
-    session_mock.search.return_value.albums = [sp_album_mock]
-    session_mock.search.return_value.artists = [sp_artist_mock]
+    session_mock.search.return_value.albums = [
+        sp_album_mock, sp_unloaded_album_mock]
+    session_mock.search.return_value.artists = [
+        sp_artist_mock, sp_unloaded_artist_mock]
     return session_mock