From 4e30fb2f488a8a6c8f1a9f4f4468a982c55dd8c2 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 24 Mar 2015 00:40:55 +0100 Subject: [PATCH] core: Make get_playlists() maintain folder hierarchy --- mopidy/core/playlists.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mopidy/core/playlists.py b/mopidy/core/playlists.py index 54797abe..e791380f 100644 --- a/mopidy/core/playlists.py +++ b/mopidy/core/playlists.py @@ -71,8 +71,12 @@ class PlaylistsController(object): playlist_refs = self.as_list() if include_tracks: - playlists = [self.lookup(r.uri) for r in playlist_refs] - return [pl for pl in playlists if pl is not None] + playlists = {r.uri: self.lookup(r.uri) for r in playlist_refs} + # Use the playlist name from as_list() because it knows about any + # playlist folder hierarchy, which lookup() does not. + return [ + playlists[r.uri].copy(name=r.name) + for r in playlist_refs if playlists[r.uri] is not None] else: return [ Playlist(uri=r.uri, name=r.name) for r in playlist_refs]