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

spotify folders not necessary as a positional arg

Browse Source 
- rename to folders
- remove confusing None for starred playlists
This commit is contained in:
alzeih 2013-07-28 23:53:47 +12:00
parent c4dcef81b4
commit 47c26acf57
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mopidy/backends/spotify/session_manager.py
View File

@ -180,10 +180,10 @@ class SpotifySessionManager(process.BaseThread, PyspotifySessionManager):
if spotify_playlist.type() == 'folder_end':
folders.pop()
playlists.append(translator.to_mopidy_playlist(
spotify_playlist, folders,
spotify_playlist, folders=folders,
bitrate=self.bitrate, username=self.username))
playlists.append(translator.to_mopidy_playlist(
self.session.starred(), None,
self.session.starred(),
bitrate=self.bitrate, username=self.username))
playlists = filter(None, playlists)
self.backend.playlists.playlists = playlists

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

@ -67,7 +67,7 @@ def to_mopidy_track(spotify_track, bitrate=None):
return track_cache[uri]
def to_mopidy_playlist(spotify_playlist, spotify_folders, bitrate=None, username=None):
def to_mopidy_playlist(spotify_playlist, folders=None, bitrate=None, username=None):
if spotify_playlist is None or spotify_playlist.type() != 'playlist':
return
try:
@ -78,8 +78,8 @@ def to_mopidy_playlist(spotify_playlist, spotify_folders, bitrate=None, username
if not spotify_playlist.is_loaded():
return Playlist(uri=uri, name='[loading...]')
name = spotify_playlist.name()
if spotify_folders:
folder_names = '/'.join(folder.name() for folder in spotify_folders)
if folders:
folder_names = '/'.join(folder.name() for folder in folders)
name = folder_names + '/' + name
tracks = [
to_mopidy_track(spotify_track, bitrate=bitrate)