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

pyspotify now returns unicode objects

Browse Source
This commit is contained in:
Antoine Pierlot-Garcin 2011-06-07 23:46:28 -04:00
parent 3b21b7bf7d
commit f6a66604b8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mopidy/backends/spotify/translator.py
View File

@ -4,7 +4,6 @@ import logging
from spotify import Link, SpotifyError
from mopidy import settings
from mopidy.backends.spotify import ENCODING
from mopidy.models import Artist, Album, Track, Playlist
logger = logging.getLogger('mopidy.backends.spotify.translator')
@ -16,7 +15,7 @@ class SpotifyTranslator(object):
return Artist(name=u'[loading...]')
return Artist(
uri=str(Link.from_artist(spotify_artist)),
name=spotify_artist.name().decode(ENCODING, 'replace'),
name=spotify_artist.name()
)
@classmethod
@ -24,7 +23,7 @@ class SpotifyTranslator(object):
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, 'replace'))
return Album(name=spotify_album.name())
@classmethod
def to_mopidy_track(cls, spotify_track):
@ -38,7 +37,7 @@ class SpotifyTranslator(object):
date = None
return Track(
uri=uri,
name=spotify_track.name().decode(ENCODING, 'replace'),
name=spotify_track.name(),
artists=[cls.to_mopidy_artist(a) for a in spotify_track.artists()],
album=cls.to_mopidy_album(spotify_track.album()),
track_no=spotify_track.index(),
@ -57,7 +56,7 @@ class SpotifyTranslator(object):
try:
return Playlist(
uri=str(Link.from_playlist(spotify_playlist)),
name=spotify_playlist.name().decode(ENCODING, 'replace'),
name=spotify_playlist.name(),
# FIXME if check on link is a hackish workaround for is_local
tracks=[cls.to_mopidy_track(t) for t in spotify_playlist
if str(Link.from_track(t, 0))],