From badc4b837696b96e8c5852113ede2722ba1eac99 Mon Sep 17 00:00:00 2001 From: Moritz Venn Date: Fri, 5 Aug 2011 22:10:20 +0200 Subject: [PATCH] webif/MP: use SCOPE_PLAYLIST instead of SCOPE_CONFIG as base for playlists otherwise the path might not exist thus resulting in an unexpected error. --- webinterface/src/WebComponents/Sources/MP.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/webinterface/src/WebComponents/Sources/MP.py b/webinterface/src/WebComponents/Sources/MP.py index 4b81f322..b3bf0fa3 100644 --- a/webinterface/src/WebComponents/Sources/MP.py +++ b/webinterface/src/WebComponents/Sources/MP.py @@ -168,28 +168,27 @@ class MP(Source): return (False, "'%s' not found in playlist" % file) def loadPlaylist(self, param): - filename = "playlist/%s" % param - from Tools.Directories import resolveFilename, SCOPE_CONFIG + from Tools.Directories import resolveFilename, SCOPE_PLAYLIST # TODO: fix error handling mp = self.tryOpenMP() if mp is None: return (False, "Mediaplayer not installed") - fullPath = resolveFilename(SCOPE_CONFIG, filename) - mp.PlaylistSelected((filename, fullPath)) + fullPath = resolveFilename(SCOPE_PLAYLIST, param) + mp.PlaylistSelected((param, fullPath)) return (True, "Playlist loaded from '%s'" % fullPath) def writePlaylist(self, param): - filename = "playlist/%s.e2pls" % param - from Tools.Directories import resolveFilename, SCOPE_CONFIG + filename = "%s.e2pls" % param + from Tools.Directories import resolveFilename, SCOPE_PLAYLIST # TODO: fix error handling mp = self.tryOpenMP() if mp is None: return (False, "Mediaplayer not installed") - fullPath = resolveFilename(SCOPE_CONFIG, filename) + fullPath = resolveFilename(SCOPE_PLAYLIST, filename) mp.playlistIOInternal.save(fullPath) return (True, "Playlist saved to '%s'" % fullPath) -- 2.20.1