From fc9875bf3d39da85026fcd564ee7acae257972ec Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Wed, 25 May 2011 21:08:34 +0200 Subject: [PATCH] Spotify albums may be None --- mopidy/backends/spotify/translator.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mopidy/backends/spotify/translator.py b/mopidy/backends/spotify/translator.py index dca2b285..15aa59ac 100644 --- a/mopidy/backends/spotify/translator.py +++ b/mopidy/backends/spotify/translator.py @@ -21,7 +21,7 @@ class SpotifyTranslator(object): @classmethod def to_mopidy_album(cls, spotify_album): - if not spotify_album.is_loaded(): + if spotify_album is None or 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)) @@ -31,7 +31,8 @@ class SpotifyTranslator(object): uri = str(Link.from_track(spotify_track, 0)) if not spotify_track.is_loaded(): return Track(uri=uri, name=u'[loading...]') - if dt.MINYEAR <= int(spotify_track.album().year()) <= dt.MAXYEAR: + if (spotify_track.album() is not None and + dt.MINYEAR <= int(spotify_track.album().year()) <= dt.MAXYEAR): date = dt.date(spotify_track.album().year(), 1, 1) else: date = None