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

spotify: Only return available tracks from lookups

Browse Source
This commit is contained in:
Trygve Aaberge 2012-12-24 00:29:37 +01:00
parent bbd8630d88
commit 8da2495e83
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mopidy/backends/spotify/library.py
View File

@ -84,7 +84,10 @@ class SpotifyLibraryProvider(base.BaseLibraryProvider):
track = Link.from_string(uri).as_track()
self._wait_for_object_to_load(track)
if track.is_loaded():
return [SpotifyTrack(track=track)]
if track.availability() == 1:
return [SpotifyTrack(track=track)]
else:
return None
else:
return [SpotifyTrack(uri=uri)]
@ -92,18 +95,18 @@ class SpotifyLibraryProvider(base.BaseLibraryProvider):
album = Link.from_string(uri).as_album()
album_browser = self.backend.spotify.session.browse_album(album)
self._wait_for_object_to_load(album_browser)
return [SpotifyTrack(track=t) for t in album_browser]
return [SpotifyTrack(track=t) for t in album_browser if t.availability() == 1]
def _lookup_artist(self, uri):
artist = Link.from_string(uri).as_artist()
artist_browser = self.backend.spotify.session.browse_artist(artist)
self._wait_for_object_to_load(artist_browser)
return [SpotifyTrack(track=t) for t in artist_browser]
return [SpotifyTrack(track=t) for t in artist_browser if t.availability() == 1]
def _lookup_playlist(self, uri):
playlist = Link.from_string(uri).as_playlist()
self._wait_for_object_to_load(playlist)
return [SpotifyTrack(track=t) for t in playlist]
return [SpotifyTrack(track=t) for t in playlist if t.availability() == 1]
def _wait_for_object_to_load(
self, spotify_obj, timeout=settings.SPOTIFY_TIMEOUT):