diff --git a/luci-app-mosdns/Makefile b/luci-app-mosdns/Makefile index ff2e49a..3112203 100644 --- a/luci-app-mosdns/Makefile +++ b/luci-app-mosdns/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-mosdns -PKG_VERSION:=1.5.9 +PKG_VERSION:=1.5.10 PKG_RELEASE:=1 LUCI_TITLE:=LuCI Support for mosdns diff --git a/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua b/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua index 04016d4..d4b2a81 100644 --- a/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua +++ b/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua @@ -169,7 +169,7 @@ o = s:taboption("advanced", Flag, "adblock", translate("Enable DNS ADblock")) o:depends("configfile", "/etc/mosdns/config.yaml") o.default = false -o = s:taboption("advanced", DynamicList, "ad_source", translate("ADblock Source"), translate("When using custom rule sources, please use rule types supported by MosDNS (domain lists).")) +o = s:taboption("advanced", DynamicList, "ad_source", translate("ADblock Source"), translate("When using custom rule sources, please use rule types supported by MosDNS (domain lists).") .. '
' .. translate("Support for local files, such as: file:///var/mosdns/example.txt")) o:depends("adblock", "1") o:value("geosite.dat", "v2ray-geosite") o:value("https://raw.githubusercontent.com/privacy-protection-tools/anti-AD/master/anti-ad-domains.txt", "anti-AD") diff --git a/luci-app-mosdns/po/zh-cn/mosdns.po b/luci-app-mosdns/po/zh-cn/mosdns.po index 13c8dee..64954cb 100644 --- a/luci-app-mosdns/po/zh-cn/mosdns.po +++ b/luci-app-mosdns/po/zh-cn/mosdns.po @@ -76,6 +76,9 @@ msgstr "广告过滤规则来源" msgid "When using custom rule sources, please use rule types supported by MosDNS (domain lists)." msgstr "使用自定义规则来源时,请使用 MosDNS 支持的规则类型(域名列表)" +msgid "Support for local files, such as: file:///var/mosdns/example.txt" +msgstr "支持本地文件,例如:file:///var/mosdns/example.txt" + msgid "Restart-Service" msgstr "重启服务" diff --git a/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh b/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh index a1fcfc0..0d15705 100755 --- a/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh +++ b/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh @@ -38,6 +38,8 @@ get_adlist() ( do if [ $(echo $url) = 'geosite.dat' ]; then echo " - \"/var/mosdns/geosite_category-ads-all.txt\"" + elif echo "$url" | grep -Eq "^file://" ; then + echo " - \"$(echo "$url" | sed 's/file:\/\///')\"" else echo " - \"/etc/mosdns/rule/adlist/$(basename $url)\"" [ ! -f "/etc/mosdns/rule/adlist/$(basename $url)" ] && touch /etc/mosdns/rule/adlist/$(basename $url) @@ -60,7 +62,7 @@ adlist_update() ( has_update=0 for url in $ad_source; do - if [ "$url" != "geosite.dat" ]; then + if [ "$url" != "geosite.dat" ] && [ $(echo "$url" | grep -c -E "^file://") -eq 0 ]; then echo "$url" >> /etc/mosdns/rule/.ad_source filename=$(basename $url) if echo "$url" | grep -Eq "^https://raw.githubusercontent.com" ; then