From 52c52da33ebf8dac8bb213f33e7ebd0d4364dc97 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sat, 13 Feb 2010 01:25:36 +0100 Subject: [PATCH] libspotify: Check is_loaded() on all Spotify objects before using them --- mopidy/backends/libspotify.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mopidy/backends/libspotify.py b/mopidy/backends/libspotify.py index df299fb2..ea491441 100644 --- a/mopidy/backends/libspotify.py +++ b/mopidy/backends/libspotify.py @@ -89,16 +89,22 @@ class LibspotifyTranslator(object): return self.uri_to_id_map[spotify_uri] def to_mopidy_artist(self, spotify_artist): + if not spotify_artist.is_loaded(): + return Artist(name=u'[loading...]') return Artist( uri=str(Link.from_artist(spotify_artist)), name=spotify_artist.name().decode(ENCODING), ) def to_mopidy_album(self, spotify_album): + if not spotify_album.is_loaded(): + return Album(name=u'[loading...]') # TODO pyspotify got much more data on albums than this return Album(name=spotify_album.name().decode(ENCODING)) def to_mopidy_track(self, spotify_track): + if not spotify_track.is_loaded(): + return Track(title=u'[loading...]') uri = str(Link.from_track(spotify_track, 0)) return Track( uri=uri, @@ -113,6 +119,8 @@ class LibspotifyTranslator(object): ) def to_mopidy_playlist(self, spotify_playlist): + if not spotify_playlist.is_loaded(): + return Playlist(name=u'[loading...]') return Playlist( uri=str(Link.from_playlist(spotify_playlist)), name=spotify_playlist.name().decode(ENCODING),