Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1597 from stangri/luci-app-simple-adblock

Browse source 
luci-app-simple-adblock: Better logic to start/stop/reload from Web UI
This commit is contained in:
Hannu Nyman 2018-01-26 16:23:38 +02:00 committed by GitHub
commit 5e59ba3e0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
applications/luci-app-simple-adblock/Makefile
View file

@ -7,9 +7,10 @@ PKG_LICENSE:=GPL-3.0+
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net> PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
LUCI_TITLE:=Simple Adblock Web UI LUCI_TITLE:=Simple Adblock Web UI
LUCI_DEPENDS:=+simple-adblock LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service.
LUCI_DEPENDS:=+luci +simple-adblock
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_RELEASE:=2 PKG_RELEASE:=5
include ../../luci.mk include ../../luci.mk

16
applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua
View file

@ -2,19 +2,11 @@ m = Map("simple-adblock", translate("Simple AdBlock Settings"))
s = m:section(NamedSection, "config", "simple-adblock") s = m:section(NamedSection, "config", "simple-adblock")
-- General options -- General options
e = s:option(Flag, "enabled", translate("Enable/start service")) e = s:option(Flag, "enabled", translate("Start Simple Adblock service"))
e.rmempty = false e.rmempty = false
function e.cfgvalue(self, section)
return self.map:get(section, "enabled") == "1" and luci.sys.init.enabled("simple-adblock") and self.enabled or self.disabled
end
function e.write(self, section, value) function e.write(self, section, value)
if value == "1" then if value ~= "1" then
luci.sys.call("/etc/init.d/simple-adblock enable >/dev/null") luci.sys.init.stop("simple-adblock")
luci.sys.call("/etc/init.d/simple-adblock start >/dev/null")
else
luci.sys.call("/etc/init.d/simple-adblock stop >/dev/null")
end end
return Flag.write(self, section, value) return Flag.write(self, section, value)
end end
@ -32,7 +24,6 @@ o3:value("1", translate("Force Router DNS server to all local devices"))
o3.rmempty = false o3.rmempty = false
o3.default = 1 o3.default = 1
local sysfs_path = "/sys/class/leds/" local sysfs_path = "/sys/class/leds/"
local leds = {} local leds = {}
if nixio.fs.access(sysfs_path) then if nixio.fs.access(sysfs_path) then
@ -49,7 +40,6 @@ if #leds ~= 0 then
end end
end end
s2 = m:section(NamedSection, "config", "simple-adblock") s2 = m:section(NamedSection, "config", "simple-adblock")
-- Whitelisted Domains -- Whitelisted Domains
d1 = s2:option(DynamicList, "whitelist_domain", translate("Whitelisted Domains"), translate("Individual domains to be whitelisted")) d1 = s2:option(DynamicList, "whitelist_domain", translate("Whitelisted Domains"), translate("Individual domains to be whitelisted"))

6
applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
View file

@ -13,9 +13,6 @@ msgstr ""
msgid "Controls system log and console output verbosity" msgid "Controls system log and console output verbosity"
msgstr "" msgstr ""
msgid "Enable/start service"
msgstr ""
msgid "Force Router DNS" msgid "Force Router DNS"
msgstr "" msgstr ""
@ -52,6 +49,9 @@ msgstr ""
msgid "Some output" msgid "Some output"
msgstr "" msgstr ""
msgid "Start Simple Adblock service"
msgstr ""
msgid "Suppress output" msgid "Suppress output"
msgstr "" msgstr ""