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

spotify: Fix flake8 warnings in lookup method

Browse Source
This commit is contained in:
Stein Magnus Jodal 2012-12-19 20:29:45 +01:00
parent aea3337fe4
commit d5c401bd07
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,6 @@ from spotify import Link, SpotifyError
from mopidy.backends import base
from mopidy.models import Track
from mopidy.backends.base import BaseLibraryProvider
from mopidy.models import Playlist
from . import translator
@ -66,10 +65,11 @@ class SpotifyLibraryProvider(base.BaseLibraryProvider):
if link.type() == Link.LINK_ALBUM:
try:
spotify_album = Link.from_string(uri).as_album()
# TODO Block until metadata_updated callback is called. Before that
# the track will be unloaded, unless it's already in the stored
# playlists.
browser = self.backend.spotify.session.browse_album(spotify_album)
# TODO Block until metadata_updated callback is called.
# Before that the track will be unloaded, unless it's
# already in the stored playlists.
browser = self.backend.spotify.session.browse_album(
spotify_album)
#wait 5 seconds
start = time.time()
@ -81,26 +81,29 @@ class SpotifyLibraryProvider(base.BaseLibraryProvider):
#for track in browser:
# track = translator.to_mopidy_track(track)
#from translator
tracks=[translator.to_mopidy_track(t) for t in browser
if str(Link.from_track(t, 0))]
playlist = Playlist(tracks=tracks, uri=uri, name=album.name)
tracks = [
translator.to_mopidy_track(t)
for t in browser if str(Link.from_track(t, 0))]
playlist = Playlist(
tracks=tracks, uri=uri, name=album.name)
return playlist
except SpotifyError as e:
logger.debug(u'Failed to lookup album "%s": %s', uri, e)
return None
#uri is an album
if link.type() == Link.LINK_ARTIST:
try:
spotify_artist = Link.from_string(uri).as_artist()
# TODO Block until metadata_updated callback is called. Before that
# the track will be unloaded, unless it's already in the stored
# playlists.
browser = self.backend.spotify.session.browse_artist(spotify_artist)
# TODO Block until metadata_updated callback is called.
# Before that the track will be unloaded, unless it's
# already in the stored playlists.
browser = self.backend.spotify.session.browse_artist(
spotify_artist)
#wait 5 seconds
start = time.time()
while not browser.is_loaded():
@ -111,28 +114,30 @@ class SpotifyLibraryProvider(base.BaseLibraryProvider):
#for track in browser:
# track = translator.to_mopidy_track(track)
#from translator
tracks=[translator.to_mopidy_track(t) for t in browser
if str(Link.from_track(t, 0))]
playlist = Playlist(tracks=tracks, uri=uri, name=artist.name)
tracks = [
translator.to_mopidy_track(t)
for t in browser if str(Link.from_track(t, 0))]
playlist = Playlist(
tracks=tracks, uri=uri, name=artist.name)
return playlist
except SpotifyError as e:
logger.debug(u'Failed to lookup album "%s": %s', uri, e)
return None
#uri is a playlist of another user
# if l.type() == Link.LINK_PLAYLIST:
# if l.type() == Link.LINK_USER:
#uri is a track
try:
spotify_track = Link.from_string(uri).as_track()
# TODO Block until metadata_updated callback is called. Before that
# the track will be unloaded, unless it's already in the stored
# playlists.
# TODO Block until metadata_updated callback is called. Before
# that the track will be unloaded, unless it's already in the
# stored playlists.
return translator.to_mopidy_track(spotify_track)
except SpotifyError as e:
logger.debug(u'Failed to lookup track "%s": %s', uri, e)