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

Merge remote-tracking branch 'trygveaa/lookup-not-unavailable' into develop

Browse Source
This commit is contained in:
Stein Magnus Jodal 2012-12-24 02:17:35 +01:00
commit 5842eabf87
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,8 @@ from . import translator
logger = logging.getLogger('mopidy.backends.spotify') logger = logging.getLogger('mopidy.backends.spotify')
TRACK_AVAILABLE = 1
class SpotifyTrack(Track): class SpotifyTrack(Track):
"""Proxy object for unloaded Spotify tracks.""" """Proxy object for unloaded Spotify tracks."""
@ -84,7 +86,7 @@ class SpotifyLibraryProvider(base.BaseLibraryProvider):
track = Link.from_string(uri).as_track() track = Link.from_string(uri).as_track()
self._wait_for_object_to_load(track) self._wait_for_object_to_load(track)
if track.is_loaded(): if track.is_loaded():
if track.availability() == 1: if track.availability() == TRACK_AVAILABLE:
return [SpotifyTrack(track=track)] return [SpotifyTrack(track=track)]
else: else:
return [] return []
@ -97,7 +99,7 @@ class SpotifyLibraryProvider(base.BaseLibraryProvider):
self._wait_for_object_to_load(album_browser) self._wait_for_object_to_load(album_browser)
return [ return [
SpotifyTrack(track=t) SpotifyTrack(track=t)
for t in album_browser if t.availability() == 1] for t in album_browser if t.availability() == TRACK_AVAILABLE]
def _lookup_artist(self, uri): def _lookup_artist(self, uri):
artist = Link.from_string(uri).as_artist() artist = Link.from_string(uri).as_artist()
@ -105,14 +107,14 @@ class SpotifyLibraryProvider(base.BaseLibraryProvider):
self._wait_for_object_to_load(artist_browser) self._wait_for_object_to_load(artist_browser)
return [ return [
SpotifyTrack(track=t) SpotifyTrack(track=t)
for t in artist_browser if t.availability() == 1] for t in artist_browser if t.availability() == TRACK_AVAILABLE]
def _lookup_playlist(self, uri): def _lookup_playlist(self, uri):
playlist = Link.from_string(uri).as_playlist() playlist = Link.from_string(uri).as_playlist()
self._wait_for_object_to_load(playlist) self._wait_for_object_to_load(playlist)
return [ return [
SpotifyTrack(track=t) SpotifyTrack(track=t)
for t in playlist if t.availability() == 1] for t in playlist if t.availability() == TRACK_AVAILABLE]
def _wait_for_object_to_load( def _wait_for_object_to_load(
self, spotify_obj, timeout=settings.SPOTIFY_TIMEOUT): self, spotify_obj, timeout=settings.SPOTIFY_TIMEOUT):