From 336f556cedf0a2c3356aec60a8c9a30573dd3c8a Mon Sep 17 00:00:00 2001 From: spl0k Date: Wed, 8 Nov 2017 23:18:41 +0100 Subject: [PATCH] Improved playlists error handling --- supysonic/api/playlists.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/supysonic/api/playlists.py b/supysonic/api/playlists.py index 8a36409..23cc5b5 100644 --- a/supysonic/api/playlists.py +++ b/supysonic/api/playlists.py @@ -34,6 +34,10 @@ def list_playlists(): if not request.user.admin: return request.error_formatter(50, 'Restricted to admins') + user = store.find(User, User.name == username).one() + if not user: + return request.error_formatter(70, 'No such user') + query = store.find(Playlist, Playlist.user_id == User.id, User.name == username).order_by(Playlist.name) return request.formatter({ 'playlists': { 'playlist': [ p.as_subsonic_playlist(request.user) for p in query ] } }) @@ -44,6 +48,9 @@ def show_playlist(): if not status: return res + if res.user_id != request.user.id and not request.user.admin: + return request.error_formatter('50', 'Private playlist') + info = res.as_subsonic_playlist(request.user) info['entry'] = [ t.as_subsonic_child(request.user, request.prefs) for t in res.get_tracks() ] return request.formatter({ 'playlist': info }) @@ -82,6 +89,7 @@ def create_playlist(): for sid in songs: track = store.get(Track, sid) if not track: + store.rollback() return request.error_formatter(70, 'Unknown song') playlist.add(track)