From 768a72597cf8ab6aa48807828e5bc0736fc65be6 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Mon, 16 Jul 2018 17:43:16 -0700 Subject: [PATCH] luci-app-simple-adblock: new start/stop button, better integration with simple-adblock Signed-off-by: Stan Grishin --- applications/luci-app-simple-adblock/Makefile | 6 +- .../luasrc/controller/simple-adblock.lua | 7 + .../luasrc/model/cbi/simple-adblock.lua | 143 ++++++++++++++++++ .../luasrc/view/simple-adblock/status.htm | 10 ++ .../po/templates/simple-adblock.pot | 11 +- 5 files changed, 173 insertions(+), 4 deletions(-) create mode 100644 applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua create mode 100644 applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua create mode 100644 applications/luci-app-simple-adblock/luasrc/view/simple-adblock/status.htm diff --git a/applications/luci-app-simple-adblock/Makefile b/applications/luci-app-simple-adblock/Makefile index 31055f120..fa98f8e0f 100644 --- a/applications/luci-app-simple-adblock/Makefile +++ b/applications/luci-app-simple-adblock/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Stan Grishin (stangri@melmac.net) +# Copyright 2017-2018 Stan Grishin (stangri@melmac.net) # This is free software, licensed under the GNU General Public License v3. include $(TOPDIR)/rules.mk @@ -8,9 +8,9 @@ PKG_MAINTAINER:=Stan Grishin LUCI_TITLE:=Simple Adblock Web UI LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service. -LUCI_DEPENDS:=+luci +simple-adblock +LUCI_DEPENDS:=+luci-mod-admin-full +simple-adblock LUCI_PKGARCH:=all -PKG_RELEASE:=5 +PKG_RELEASE:=14 include ../../luci.mk diff --git a/applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua b/applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua new file mode 100644 index 000000000..98f69ac96 --- /dev/null +++ b/applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua @@ -0,0 +1,7 @@ +module("luci.controller.simple-adblock", package.seeall) +function index() + if not nixio.fs.access("/etc/config/simple-adblock") then + return + end + entry({"admin", "services", "simple-adblock"}, cbi("simple-adblock"), _("Simple AdBlock")) +end diff --git a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua new file mode 100644 index 000000000..aa62ff56c --- /dev/null +++ b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua @@ -0,0 +1,143 @@ +-- Copyright 2016-2018 Stan Grishin +-- Licensed to the public under the Apache License 2.0. + +m = Map("simple-adblock", translate("Simple AdBlock Settings")) + +h = m:section(NamedSection, "config", "simple-adblock", translate("Service Status")) + +local packageName = "simple-adblock" +local uci = require "luci.model.uci".cursor() +local util = require "luci.util" +local enabledFlag = uci:get(packageName, "config", "enabled") +local status = util.ubus('service', 'list', { name = packageName }) +if status and status[packageName] and status[packageName]['instances'] and status[packageName]['instances']['status'] and status[packageName]['instances']['status']['data'] and status[packageName]['instances']['status']['data']['status'] then + status = status[packageName]['instances']['status']['data']['status'] +else + status = "Stopped" +end +if status:match("Reloading") then + ds = h:option(DummyValue, "_dummy", translate("Service Status")) + ds.template = "simple-adblock/status" + ds.value = status +else + en = h:option(Button, "__toggle") + if enabledFlag ~= "1" or status:match("Stopped") then + en.title = translate("Service is disabled/stopped") + en.inputtitle = translate("Enable/Start") + en.inputstyle = "apply" + if nixio.fs.access("/var/simple-adblock.cache") then + ds = h:option(DummyValue, "_dummy", translate("Service Status")) + ds.template = "simple-adblock/status" + ds.value = "Cache file containing " .. luci.util.trim(luci.sys.exec("wc -l < /var/simple-adblock.cache")) .. " domains found" + end + else + en.title = translate("Service is enabled/started") + en.inputtitle = translate("Stop/Disable") + en.inputstyle = "reset" + ds = h:option(DummyValue, "_dummy", translate("Service Status")) + ds.template = "simple-adblock/status" + ds.value = status + if not status:match("Success") then + reload = h:option(Button, "__reload") + reload.title = translate("Service started with error") + reload.inputtitle = translate("Reload") + reload.inputstyle = "apply" + function reload.write() + luci.sys.exec("/etc/init.d/simple-adblock reload") + luci.http.redirect(luci.dispatcher.build_url("admin/services/" .. packageName)) + end + end + end + function en.write() + enabledFlag = enabledFlag == "1" and "0" or "1" + uci:set(packageName, "config", "enabled", enabledFlag) + uci:save(packageName) + uci:commit(packageName) + if enabledFlag == "0" then + luci.sys.init.stop(packageName) +-- luci.sys.exec("/etc/init.d/simple-adblock killcache") + else + luci.sys.init.enable(packageName) + luci.sys.init.start(packageName) + end + luci.http.redirect(luci.dispatcher.build_url("admin/services/" .. packageName)) + end +end + +s = m:section(NamedSection, "config", "simple-adblock", translate("Configuration")) +-- General options +s:tab("basic", translate("Basic Configuration")) + +o2 = s:taboption("basic", ListValue, "verbosity", translate("Output Verbosity Setting"),translate("Controls system log and console output verbosity")) +o2:value("0", translate("Suppress output")) +o2:value("1", translate("Some output")) +o2:value("2", translate("Verbose output")) +o2.rmempty = false +o2.default = 2 + +o3 = s:taboption("basic", ListValue, "force_dns", translate("Force Router DNS"), translate("Forces Router DNS use on local devices, also known as DNS Hijacking")) +o3:value("0", translate("Let local devices use their own DNS servers if set")) +o3:value("1", translate("Force Router DNS server to all local devices")) +o3.rmempty = false +o3.default = 1 + +local sysfs_path = "/sys/class/leds/" +local leds = {} +if nixio.fs.access(sysfs_path) then + leds = nixio.util.consume((nixio.fs.dir(sysfs_path))) +end +if #leds ~= 0 then + o3 = s:taboption("basic", Value, "led", translate("LED to indicate status"), translate("Pick the LED not already used in") + .. [[ ]] + .. translate("System LED Configuration") .. [[]]) + o3.rmempty = true + o3:value("", translate("none")) + for k, v in ipairs(leds) do + o3:value(v) + end +end + +s:tab("advanced", translate("Advanced Configuration")) + +o6 = s:taboption("advanced", Value, "boot_delay", translate("Delay (in seconds) for on-boot start"), translate("Run service after set delay on boot")) +o6.default = 120 +o6.datatype = "range(1,600)" + +o7 = s:taboption("advanced", Value, "download_timeout", translate("Download time-out (in seconds)"), translate("Stop the download if it is stalled for set number of seconds")) +o7.default = 10 +o7.datatype = "range(1,60)" + +o8 = s:taboption("advanced", ListValue, "debug", translate("Enable Debugging"), translate("Enables debug output to /tmp/simple-adblock.log")) +o8:value("", translate("Disable Debugging")) +o8:value("1", translate("Enable Debugging")) +o8.rmempty = true +o8.default = 0 + + +s2 = m:section(NamedSection, "config", "simple-adblock", translate("Whitelist and Blocklist Management")) +-- Whitelisted Domains +d1 = s2:option(DynamicList, "whitelist_domain", translate("Whitelisted Domains"), translate("Individual domains to be whitelisted")) +d1.addremove = false +d1.optional = false + +-- Blacklisted Domains +d3 = s2:option(DynamicList, "blacklist_domain", translate("Blacklisted Domains"), translate("Individual domains to be blacklisted")) +d3.addremove = false +d3.optional = false + +-- Whitelisted Domains URLs +d2 = s2:option(DynamicList, "whitelist_domains_url", translate("Whitelisted Domain URLs"), translate("URLs to lists of domains to be whitelisted")) +d2.addremove = false +d2.optional = false + +-- Blacklisted Domains URLs +d4 = s2:option(DynamicList, "blacklist_domains_url", translate("Blacklisted Domain URLs"), translate("URLs to lists of domains to be blacklisted")) +d4.addremove = false +d4.optional = false + +-- Blacklisted Hosts URLs +d5 = s2:option(DynamicList, "blacklist_hosts_url", translate("Blacklisted Hosts URLs"), translate("URLs to lists of hosts to be blacklisted")) +d5.addremove = false +d5.optional = false + +return m diff --git a/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/status.htm b/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/status.htm new file mode 100644 index 000000000..c45342840 --- /dev/null +++ b/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/status.htm @@ -0,0 +1,10 @@ +<%# +Copyright 2017-2018 Dirk Brenken (dev@brenken.org) +This is free software, licensed under the Apache License, Version 2.0 +-%> + +<%+cbi/valueheader%> + + + +<%+cbi/valuefooter%> diff --git a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot index 1a71cae62..8414e4a2c 100644 --- a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot +++ b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot @@ -13,6 +13,9 @@ msgstr "" msgid "Controls system log and console output verbosity" msgstr "" +msgid "Enable/Start" +msgstr "" + msgid "Force Router DNS" msgstr "" @@ -40,6 +43,12 @@ msgstr "" msgid "Pick the LED not already used in" msgstr "" +msgid "Service is disabled/stopped" +msgstr "" + +msgid "Service is enabled/started" +msgstr "" + msgid "Simple AdBlock" msgstr "" @@ -49,7 +58,7 @@ msgstr "" msgid "Some output" msgstr "" -msgid "Start Simple Adblock service" +msgid "Stop/Disable" msgstr "" msgid "Suppress output" -- 2.25.1