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

Merge pull request #6621 from stangri/master-luci-app-adblock-fast

Browse source 
luci-app-adblock-fast: bugfix: working re-download
This commit is contained in:
Stan Grishin 2023-10-06 16:42:45 -06:00 committed by GitHub
commit f7ab758d26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-adblock-fast/Makefile
View file

@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca> PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_VERSION:=1.0.0-4 PKG_VERSION:=1.0.0-6
LUCI_TITLE:=AdBlock-Fast Web UI LUCI_TITLE:=AdBlock-Fast Web UI
LUCI_DESCRIPTION:=Provides Web UI for adblock-fast service. LUCI_DESCRIPTION:=Provides Web UI for adblock-fast service.

6
applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js
View file

@ -288,11 +288,11 @@ var status = baseclass.extend({
var text = ""; var text = "";
reply.status.errors.forEach((element) => { reply.status.errors.forEach((element) => {
text += text +=
errorTable[element.id].format(element.extra || " ") + "<br />"; errorTable[element.id].format(element.extra || " ") + "!<br />";
}); });
text += _("Errors encountered, please check the %sREADME%s!").format( text += _("Errors encountered, please check the %sREADME%s").format(
'<a href="' + pkg.URL + '" target="_blank">', '<a href="' + pkg.URL + '" target="_blank">',
"</a><br />" "</a>!<br />"
); );
var errorsText = E("div", {}, text); var errorsText = E("div", {}, text);
var errorsField = E("div", { class: "cbi-value-field" }, errorsText); var errorsField = E("div", { class: "cbi-value-field" }, errorsText);

2
applications/luci-app-adblock-fast/po/templates/adblock-fast.pot
View file

@ -200,7 +200,7 @@ msgid "Error"
msgstr "" msgstr ""
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:293 #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:293
msgid "Errors encountered, please check the %sREADME%s!" msgid "Errors encountered, please check the %sREADME%s"
msgstr "" msgstr ""
#: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:117 #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:117

3
applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast
View file

@ -10,6 +10,7 @@
# ubus -S call luci.adblock-fast getInitStatus '{"name": "adblock-fast" }' # ubus -S call luci.adblock-fast getInitStatus '{"name": "adblock-fast" }'
# ubus -S call luci.adblock-fast getPlatformSupport '{"name": "adblock-fast" }' # ubus -S call luci.adblock-fast getPlatformSupport '{"name": "adblock-fast" }'
# ubus -S call luci.adblock-fast setInitAction '{"name": "adblock-fast", "action": "start" }' # ubus -S call luci.adblock-fast setInitAction '{"name": "adblock-fast", "action": "start" }'
# ubus -S call luci.adblock-fast setInitAction '{"name": "adblock-fast", "action": "dl" }'
# ubus -S call luci.adblock-fast setInitAction '{"name": "adblock-fast", "action": "stop" }' # ubus -S call luci.adblock-fast setInitAction '{"name": "adblock-fast", "action": "stop" }'
. /lib/functions.sh . /lib/functions.sh
@ -134,7 +135,7 @@ set_init_action() {
cmd="uci -q set ${name}.config.enabled=1 && uci commit $name";; cmd="uci -q set ${name}.config.enabled=1 && uci commit $name";;
disable) disable)
cmd="uci -q set ${name}.config.enabled=0 && uci commit $name";; cmd="uci -q set ${name}.config.enabled=0 && uci commit $name";;
start|stop|reload|restart) start|stop|reload|restart|dl)
cmd="/etc/init.d/${name} ${action}";; cmd="/etc/init.d/${name} ${action}";;
esac esac
if [ -n "$cmd" ] && eval "${cmd}" 1>/dev/null 2>&1; then if [ -n "$cmd" ] && eval "${cmd}" 1>/dev/null 2>&1; then