luci-app-dnscrypt-proxy: fix resolver selection

* fix regex for resolver selection,
bring back 'cs-*' and 'securedns' entries

Signed-off-by: Dirk Brenken <dev@brenken.org>

diff --git a/applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua b/applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua
index 5198fa82dea1c5e5e57635fc9ac09900531e15e4..368c6673ad5cfa6c242325e03d0a4568567fdba7 100644 (file)
--- a/applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua
+++ b/applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua
@@ -33,8 +33,19 @@ for line in io.lines(res_input) do
        local name,
        location,
        dnssec,
-       nolog = line:match("^([^,]+),.-,\".-\",\"(.-)\",.-,[0-9],([yesno]+),([yesno]+)")
-       res_list[#res_list + 1] = { name = name, location = location, dnssec = dnssec, nolog = nolog }
+       nolog = line:match("^([^,]+),.-,\".-\",\"*(.-)\"*,.-,[0-9],\"*([yesno]+)\"*,\"*([yesno]+)\"*,.*")
+       if name ~= "" and name ~= "Name" then
+               if location == "" then
+                       location = "-"
+               end
+               if dnssec == "" then
+                       dnssec = "-"
+               end
+               if nolog == "" then
+                       nolog = "-"
+               end
+               res_list[#res_list + 1] = { name = name, location = location, dnssec = dnssec, nolog = nolog }
+       end
 end
 
 m = Map("dnscrypt-proxy", translate("DNSCrypt-Proxy"),
@@ -174,7 +185,7 @@ i3.datatype = "hostname"
 i3.widget = "select"
 local i, v
 for i, v in ipairs(res_list) do
-       if v.name and v.location and v.dnssec and v.nolog and v.name ~= "Name" then
+       if v.name then
                i3:value(v.name, v.name .. " (" .. v.location .. "/" .. v.dnssec .. "/" .. v.nolog .. ")")
        end
 end