From cd456ff616e0c2c18afef2753c01b957bd3a66e2 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 9 Apr 2012 13:12:25 +0000 Subject: applications/luci-minidlna: fix possible nil indexing if album art option is unset, only show one filename in placeholder --- applications/luci-minidlna/luasrc/model/cbi/minidlna.lua | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'applications') diff --git a/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua b/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua index 7c9f4dee1..41e2826ee 100644 --- a/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua +++ b/applications/luci-minidlna/luasrc/model/cbi/minidlna.lua @@ -143,16 +143,23 @@ s:taboption("general", DynamicList, "media_dir", translate("Media directories:") o = s:taboption("general", DynamicList, "album_art_names", translate("Album art names:"), translate("This is a list of file names to check for when searching for album art.")) o.rmempty = true -o.placeholder = "Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg" +o.placeholder = "Cover.jpg" function o.cfgvalue(self, section) local rv = { } + local val = Value.cfgvalue(self, section) - if type(val) == "table" then val = table.concat(val, "/") end + if type(val) == "table" then + val = table.concat(val, "/") + elseif not val then + val = "" + end + local file for file in val:gmatch("[^/%s]+") do rv[#rv+1] = file end + return rv end -- cgit v1.2.3