From 44f55a8883a2be66a31ddbe9abdfd98c620c218f Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Thu, 12 Mar 2020 07:48:51 -0700 Subject: [PATCH 1/2] luci-app-adbyby-plus: keed adblock after upgrade --- package/lean/luci-app-adbyby-plus/Makefile | 2 +- package/lean/luci-app-adbyby-plus/luasrc/controller/adbyby.lua | 2 +- .../luci-app-adbyby-plus/luasrc/model/cbi/adbyby/advanced.lua | 3 +-- package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby | 2 +- .../lean/luci-app-adbyby-plus/root/lib/upgrade/keep.d/adbyby | 3 ++- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/lean/luci-app-adbyby-plus/Makefile b/package/lean/luci-app-adbyby-plus/Makefile index dc615b6c70..d4be8ef2a1 100644 --- a/package/lean/luci-app-adbyby-plus/Makefile +++ b/package/lean/luci-app-adbyby-plus/Makefile @@ -10,7 +10,7 @@ LUCI_DEPENDS:=+adbyby +wget +ipset +dnsmasq-full LUCI_PKGARCH:=all PKG_NAME:=luci-app-adbyby-plus PKG_VERSION:=2.0 -PKG_RELEASE:=63 +PKG_RELEASE:=65 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-adbyby-plus/luasrc/controller/adbyby.lua b/package/lean/luci-app-adbyby-plus/luasrc/controller/adbyby.lua index 85b82b496f..e067ad84cb 100644 --- a/package/lean/luci-app-adbyby-plus/luasrc/controller/adbyby.lua +++ b/package/lean/luci-app-adbyby-plus/luasrc/controller/adbyby.lua @@ -47,7 +47,7 @@ luci.sys.exec("/usr/share/adbyby/rule-update") end if tonumber(icount) ~= tonumber(oldcount) then - luci.sys.exec("rm -rf /usr/share/adbyby/rules/* && cp -a /tmp/rules /usr/share/adbyby/") + luci.sys.exec("rm -f /usr/share/adbyby/rules/data/* /usr/share/adbyby/rules/host/* && cp -a /tmp/rules /usr/share/adbyby/") luci.sys.exec("/etc/init.d/dnsmasq reload") retstring=tostring(math.ceil(tonumber(icount))) else diff --git a/package/lean/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/advanced.lua b/package/lean/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/advanced.lua index 6e1a1d0b7a..f71b49570d 100644 --- a/package/lean/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/advanced.lua +++ b/package/lean/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/advanced.lua @@ -41,8 +41,7 @@ o.description = translate("AdGuardHome / Host / DNSMASQ rules auto-convert") o = s:option(Button,"delete",translate("Delete All Subscribe Rules")) o.inputstyle = "reset" o.write = function() - SYS.exec("rm -rf /usr/share/adbyby/rules/data/* /usr/share/adbyby/rules/host/*") - SYS.exec("mkdir -p /usr/share/adbyby/rules/data/ /usr/share/adbyby/rules/host/") + SYS.exec("rm -f /usr/share/adbyby/rules/data/* /usr/share/adbyby/rules/host/*") SYS.exec("/etc/init.d/adbyby restart 2>&1 &") luci.http.redirect(luci.dispatcher.build_url("admin", "services", "adbyby", "advanced")) end diff --git a/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby b/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby index 4a9dc56025..b128bbf2c6 100755 --- a/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby +++ b/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby @@ -106,7 +106,7 @@ add_dns() { mkdir -p /var/etc/dnsmasq-adbyby.d mkdir -p /tmp/dnsmasq.d - mkdir -p /usr/share/adbyby/rules/host /usr/share/adbyby/rules/data + awk '!/^$/&&!/^#/{printf("ipset=/%s/'"adbyby_esc"'\n",$0)}' $PROG_PATH/adesc.conf > /var/etc/dnsmasq-adbyby.d/06-dnsmasq.esc awk '!/^$/&&!/^#/{printf("address=/%s/'"0.0.0.0"'\n",$0)}' $PROG_PATH/adblack.conf > /var/etc/dnsmasq-adbyby.d/07-dnsmasq.black cat > /tmp/dnsmasq.d/dnsmasq-adbyby.conf < Date: Thu, 12 Mar 2020 22:49:17 +0800 Subject: [PATCH 2/2] Update adbyby.po (#3746) --- .../luci-app-adbyby-plus/po/zh-cn/adbyby.po | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/package/lean/luci-app-adbyby-plus/po/zh-cn/adbyby.po b/package/lean/luci-app-adbyby-plus/po/zh-cn/adbyby.po index d71ceddd11..86a01d9b55 100644 --- a/package/lean/luci-app-adbyby-plus/po/zh-cn/adbyby.po +++ b/package/lean/luci-app-adbyby-plus/po/zh-cn/adbyby.po @@ -73,6 +73,24 @@ msgstr "Adblock Plus 规则数据库" msgid "Subscribe 3rd Rules Data" msgstr "订阅第三方去广告规则" +msgid "Records" +msgstr "条记录" + +msgid "Refresh Data" +msgstr "更新数据库" + +msgid "Refresh..." +msgstr "正在更新，请稍候.." + +msgid "Refresh OK!" +msgstr "更新成功！" + +msgid "Refresh Error!" +msgstr "更新失败！" + +msgid "No new data!" +msgstr "你已经是最新数据，无需更新！" + msgid "Delete All Subscribe Rules" msgstr "清空所有订阅的规则库"