feature:add del gfwlist

luasrc/model/cbi/AdGuardHome/base.lua

@@ -124,9 +124,8 @@ end
 end
 ---- log file
 o = s:option(Value, "logfile", translate("Runtime log file"), translate("AdGuardHome runtime Log file if 'syslog': write to system log;if empty no log"))
-o.default     = ""
 o.datatype    = "string"
-o.optional = true
+o.rmempty = true
 o.validate=function(self, value)
 if fs.stat(value,"type")=="dir" then
 	fs.rmdir(value)
@@ -152,14 +151,21 @@ a="Added"
 else
 a="Not added"
 end
+o=s:option(Button,"gfwdel",translate("Del gfwlist"),translate(a))
+o.optional = true
+o.inputtitle=translate("Del")
+o.write=function()
+	luci.sys.exec("sh /usr/share/AdGuardHome/gfw2adg.sh del 2>&1")
+	luci.http.redirect(luci.dispatcher.build_url("admin","services","AdGuardHome"))
+end
 o=s:option(Button,"gfwadd",translate("Add gfwlist"),translate(a))
 o.optional = true
 o.inputtitle=translate("Add")
 o.write=function()
-luci.sys.exec("sh /usr/share/AdGuardHome/gfw2adg.sh 2>&1")
-luci.http.redirect(luci.dispatcher.build_url("admin","services","AdGuardHome"))
+	luci.sys.exec("sh /usr/share/AdGuardHome/gfw2adg.sh 2>&1")
+	luci.http.redirect(luci.dispatcher.build_url("admin","services","AdGuardHome"))
 end
-o = s:option(Value, "gfwupstream", translate("Gfwlist upstream dns server"), translate("Gfwlist domain upstream dns service"))
+o = s:option(Value, "gfwupstream", translate("Gfwlist upstream dns server"), translate("Gfwlist domain upstream dns service")..translate(a))
 o.default     = "tcp://208.67.220.220:5353"
 o.datatype    = "string"
 o.optional = true

po/zh-cn/AdGuardHome.po

@@ -204,3 +204,9 @@ msgstr "计划任务截短查询日志"
 
 msgid "Download links for update"
 msgstr "升级用的下载链接"
+
+msgid "Del gfwlist"
+msgstr "删除gfw列表"
+
+msgid "Del"
+msgstr "删除"

root/usr/share/AdGuardHome/gfw2adg.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
 configpath=$(uci get AdGuardHome.AdGuardHome.configpath)
+[ "$1" == "del" ] && sed -i '/programaddstart/,/programaddend/d' $configpath && exit 0
 gfwupstream=$(uci get AdGuardHome.AdGuardHome.gfwupstream)
 if [ -z $gfwupstream ]; then
 gfwupstream="tcp://208.67.220.220:5353"