Merge Lean's source

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
 

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

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

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 "清空所有订阅的规则库"
 

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 <<EOF

package/lean/luci-app-adbyby-plus/root/lib/upgrade/keep.d/adbyby

@@ -2,4 +2,5 @@
 /usr/share/adbyby/adblack.conf
 /usr/share/adbyby/blockip.conf
 /usr/share/adbyby/adesc.conf
-/usr/share/adbyby/rules.txt
+/usr/share/adbyby/rules.txt
+/usr/share/adbyby/dnsmasq.adblock