diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2017-10-08 10:36:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-08 10:36:18 +0300 |
| commit | 2d011a5e9794ddb7e001e7bc2bda15c2942b0db5 (patch) | |
| tree | 74e32b4e883ae91c0ce680e9f1cd5808f187fc18 | |
| parent | a876daa4ef390ea0787e2f95b26e87f1b28e1210 (diff) | |
| parent | 1f79a51aa963e2ab4ca94b181e20ff352e5936bc (diff) | |
Merge pull request #1386 from dibdot/dnscrypt-proxy
luci-app-dnscrypt-proxy: fix resolver selection
| -rw-r--r-- | applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua | 17 |
1 files changed, 14 insertions, 3 deletions
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 5198fa82de..368c6673ad 100644 --- 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 |