X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=applications%2Fluci-app-adblock%2Fluasrc%2Fmodel%2Fcbi%2Fadblock%2Foverview_tab.lua;h=68f9c8897eaf78e9d3df1c75e6b006dccd64a939;hb=14dca2f3eef863c03b87bf21dc5787a524d84b62;hp=7919b71516f7a9e8729650d901264a679d8b4672;hpb=f2264da43cd521bd64e687c91bc7b94c3e28e7b3;p=project%2Fluci.git
diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
index 7919b7151..68f9c8897 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
@@ -1,107 +1,149 @@
--- Copyright 2016 Hannu Nyman
-- Copyright 2017 Dirk Brenken (dev@brenken.org)
-- This is free software, licensed under the Apache License, Version 2.0
+local fs = require("nixio.fs")
+local uci = require("uci")
local sys = require("luci.sys")
-local util = require("luci.util")
-local data = util.ubus("service", "get_data", "name", "adblock") or { }
-local dnsFile1 = sys.exec("find '/tmp/dnsmasq.d' -maxdepth 1 -type f -name 'adb_list*' -print 2>/dev/null")
-local dnsFile2 = sys.exec("find '/var/lib/unbound' -maxdepth 1 -type f -name 'adb_list*' -print 2>/dev/null")
+local json = require("luci.jsonc")
+local adbinput = uci.get("adblock", "global", "adb_rtfile") or "/tmp/adb_runtime.json"
+local dnspath = uci.get("adblock", "global", "adb_dnsdir") or ""
+local parse = json.parse(fs.readfile(adbinput) or "")
+if parse ~= nil then
+ version = parse.data.adblock_version
+ domains = parse.data.blocked_domains
+ fetch = parse.data.fetch_info
+ backend = parse.data.dns_backend
+ rundate = parse.data.last_rundate
+ if dnspath == "" then
+ if backend == "dnsmasq" then
+ dnspath = "/tmp/dnsmasq.d"
+ elseif backend == "unbound" then
+ dnspath = "/var/lib/unbound"
+ elseif backend == "named" then
+ dnspath = "/var/lib/bind"
+ end
+ end
+end
+local dnsfile = dnspath .. "/.adb_hidden/adb_list.overall"
m = Map("adblock", translate("Adblock"),
translate("Configuration of the adblock package to block ad/abuse domains by using DNS. ")
- .. translate("For further information ")
- .. [[]]
- .. translate("see online documentation")
- .. [[]]
- .. translate("."))
+ .. translatef("For further information "
+ .. ""
+ .. "see online documentation", "https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md"))
+
+function m.on_after_commit(self)
+ function e3.validate(self, value)
+ if value == "0" then
+ luci.sys.call("/etc/init.d/adblock reload >/dev/null 2>&1")
+ else
+ luci.sys.call("/etc/init.d/adblock start >/dev/null 2>&1")
+ end
+ end
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "adblock"))
+end
-- Main adblock options
s = m:section(NamedSection, "global", "adblock")
o1 = s:option(Flag, "adb_enabled", translate("Enable adblock"))
+o1.default = o1.enabled
o1.rmempty = false
-o1.default = 0
btn = s:option(Button, "", translate("Suspend / Resume adblock"))
-if data.adblock == nil then
- btn.inputtitle = "n/a"
- btn.inputstyle = nil
- btn.disabled = true
-elseif dnsFile1 ~= "" or dnsFile2 ~= "" then
- btn.inputtitle = "Suspend adblock"
- btn.inputstyle = "reset"
+if parse ~= nil and nixio.fs.access(dnsfile) then
+ btn.inputtitle = translate("Resume adblock")
+ btn.inputstyle = "apply"
btn.disabled = false
function btn.write()
- luci.sys.call("/etc/init.d/adblock suspend >/dev/null 2>&1")
+ luci.sys.call("/etc/init.d/adblock resume >/dev/null 2>&1")
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "adblock"))
end
else
- btn.inputtitle = "Resume adblock"
- btn.inputstyle = "apply"
+ btn.inputtitle = translate("Suspend adblock")
+ btn.inputstyle = "reset"
btn.disabled = false
function btn.write()
- luci.sys.call("/etc/init.d/adblock resume >/dev/null 2>&1")
+ luci.sys.call("/etc/init.d/adblock suspend >/dev/null 2>&1")
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "adblock"))
end
end
-o2 = s:option(Flag, "adb_debug", translate("Enable verbose debug logging"))
-o2.default = o2.disabled
-o2.rmempty = false
+o2 = s:option(Value, "adb_iface", translate("Restrict interface trigger to certain interface(s)"),
+ translate("Space separated list of interfaces that trigger adblock processing. "..
+ "To disable event driven (re-)starts remove all entries."))
+o2.rmempty = true
+
+o3 = s:option(Value, "adb_triggerdelay", translate("Trigger delay"),
+ translate("Additional trigger delay in seconds before adblock processing begins."))
+o3.default = 2
+o3.datatype = "range(1,90)"
+o3.rmempty = false
-o3 = s:option(Value, "adb_iface", translate("Restrict interface reload trigger to certain interface(s)"),
- translate("Space separated list of interfaces that trigger a reload action. "..
- "To disable reload trigger at all set it to 'false'."))
-o3.rmempty =false
+o4 = s:option(Flag, "adb_debug", translate("Enable verbose debug logging"))
+o4.default = o4.disabled
+o4.rmempty = false
-- Runtime information
- ds = s:option(DummyValue, "_dummy", translate("Runtime information"))
- ds.template = "cbi/nullsection"
+ds = s:option(DummyValue, "_dummy", translate("Runtime information"))
+ds.template = "cbi/nullsection"
+
+dv1 = s:option(DummyValue, "status", translate("Status"))
+dv1.template = "adblock/runtime"
+if parse == nil then
+ dv1.value = translate("n/a")
+elseif domains == "0" then
+ dv1.value = translate("no domains blocked")
+elseif nixio.fs.access(dnsfile) then
+ dv1.value = translate("suspended")
+else
+ dv1.value = translate("active")
+end
- dv1 = s:option(DummyValue, "adblock_version", translate("Adblock version"))
- dv1.template = "adblock/runtime"
- if data.adblock ~= nil then
- dv1.value = data.adblock.adblock.adblock_version or "n/a"
- else
- dv1.value = "n/a"
- end
+dv2 = s:option(DummyValue, "adblock_version", translate("Adblock version"))
+dv2.template = "adblock/runtime"
+if parse == nil then
+ dv2.value = translate("n/a")
+else
+ dv2.value = version
+end
- dv2 = s:option(DummyValue, "status", translate("Status"))
- dv2.template = "adblock/runtime"
- if data.adblock == nil then
- dv2.value = "n/a"
- elseif dnsFile1 ~= "" or dnsFile2 ~= "" then
- dv2.value = "active"
- else
- dv2.value = "suspended"
- end
+dv3 = s:option(DummyValue, "fetch_info", translate("Download Utility (SSL Library)"),
+ translate("For SSL protected blocklist sources you need a suitable SSL library, e.g. 'libustream-ssl' or the wget 'built-in'."))
+dv3.template = "adblock/runtime"
+if parse == nil then
+ dv3.value = translate("n/a")
+else
+ dv3.value = fetch
+end
- dv3 = s:option(DummyValue, "dns_backend", translate("DNS backend"))
- dv3.template = "adblock/runtime"
- if data.adblock ~= nil then
- dv3.value = data.adblock.adblock.dns_backend or "n/a"
- else
- dv3.value = "n/a"
- end
+dv4 = s:option(DummyValue, "dns_backend", translate("DNS backend"))
+dv4.template = "adblock/runtime"
+if parse == nil then
+ dv4.value = translate("n/a")
+else
+ dv4.value = backend
+end
- dv4 = s:option(DummyValue, "blocked_domains", translate("Blocked domains (overall)"))
- dv4.template = "adblock/runtime"
- if data.adblock ~= nil then
- dv4.value = data.adblock.adblock.blocked_domains or "n/a"
- else
- dv4.value = "n/a"
- end
+dv5 = s:option(DummyValue, "blocked_domains", translate("Blocked domains (overall)"))
+dv5.template = "adblock/runtime"
+if parse == nil then
+ dv5.value = translate("n/a")
+else
+ dv5.value = domains
+end
- dv5 = s:option(DummyValue, "last_rundate", translate("Last rundate"))
- dv5.template = "adblock/runtime"
- if data.adblock ~= nil then
- dv5.value = data.adblock.adblock.last_rundate or "n/a"
- else
- dv5.value = "n/a"
- end
+dv6 = s:option(DummyValue, "last_rundate", translate("Last rundate"))
+dv6.template = "adblock/runtime"
+if parse == nil then
+ dv6.value = translate("n/a")
+else
+ dv6.value = rundate
+end
--- Blocklist options
+-- Blocklist table
bl = m:section(TypedSection, "source", translate("Blocklist sources"),
translate("Available blocklist sources. ")
@@ -109,20 +151,47 @@ bl = m:section(TypedSection, "source", translate("Blocklist sources"),
bl.template = "cbi/tblsection"
name = bl:option(Flag, "enabled", translate("Enabled"))
-name.rmempty = false
+name.rmempty = false
+
+ssl = bl:option(DummyValue, "adb_src", translate("SSL req."))
+function ssl.cfgvalue(self, section)
+ local source = self.map:get(section, "adb_src")
+ if source and source:match("https://") then
+ return translate("Yes")
+ else
+ return translate("No")
+ end
+end
des = bl:option(DummyValue, "adb_src_desc", translate("Description"))
--- Backup options
+-- Extra options
-s = m:section(NamedSection, "global", "adblock", translate("Backup options"))
+e = m:section(NamedSection, "global", "adblock", translate("Extra options"),
+ translate("Options for further tweaking in case the defaults are not suitable for you."))
-o4 = s:option(Flag, "adb_backup", translate("Enable blocklist backup"))
-o4.rmempty = false
-o4.default = 0
+e1 = e:option(Flag, "adb_forcedns", translate("Force local DNS"),
+ translate("Redirect all DNS queries to the local resolver."))
+e1.default = e1.disabled
+e1.rmempty = false
+
+e2 = e:option(Flag, "adb_forcesrt", translate("Force Overall Sort"),
+ translate("Enable memory intense overall sort / duplicate removal on low memory devices (< 64 MB RAM)"))
+e2.default = e2.disabled
+e2.rmempty = false
+
+e3 = e:option(Flag, "adb_manmode", translate("Manual mode"),
+ translate("Do not automatically update blocklists during startup, use blocklist backups instead."))
+e3.default = e3.disabled
+e3.rmempty = false
+
+e4 = e:option(Flag, "adb_backup", translate("Enable blocklist backup"),
+ translate("Create compressed blocklist backups, they will be used in case of download errors or during startup in manual mode."))
+e4.default = e4.disabled
+e4.rmempty = false
-o5 = s:option(Value, "adb_backupdir", translate("Backup directory"))
-o5.rmempty = false
-o5.datatype = "directory"
+e5 = e:option(Value, "adb_backupdir", translate("Backup directory"))
+e5.datatype = "directory"
+e5.rmempty = false
return m