andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libspotify: Check is_loaded() on all Spotify objects before using them

Browse Source
This commit is contained in:
Stein Magnus Jodal 2010-02-13 01:25:36 +01:00
parent 3784bee583
commit 52c52da33e
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mopidy/backends/libspotify.py
View File

@ -89,16 +89,22 @@ class LibspotifyTranslator(object):
return self.uri_to_id_map[spotify_uri] return self.uri_to_id_map[spotify_uri]
def to_mopidy_artist(self, spotify_artist): def to_mopidy_artist(self, spotify_artist):
if not spotify_artist.is_loaded():
return Artist(name=u'[loading...]')
return Artist( return Artist(
uri=str(Link.from_artist(spotify_artist)), uri=str(Link.from_artist(spotify_artist)),
name=spotify_artist.name().decode(ENCODING), name=spotify_artist.name().decode(ENCODING),
) )
def to_mopidy_album(self, spotify_album): 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 # TODO pyspotify got much more data on albums than this
return Album(name=spotify_album.name().decode(ENCODING)) return Album(name=spotify_album.name().decode(ENCODING))
def to_mopidy_track(self, spotify_track): 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)) uri = str(Link.from_track(spotify_track, 0))
return Track( return Track(
uri=uri, uri=uri,
@ -113,6 +119,8 @@ class LibspotifyTranslator(object):
) )
def to_mopidy_playlist(self, spotify_playlist): def to_mopidy_playlist(self, spotify_playlist):
if not spotify_playlist.is_loaded():
return Playlist(name=u'[loading...]')
return Playlist( return Playlist(
uri=str(Link.from_playlist(spotify_playlist)), uri=str(Link.from_playlist(spotify_playlist)),
name=spotify_playlist.name().decode(ENCODING), name=spotify_playlist.name().decode(ENCODING),