From 906844ec40a3b8093d7a6eca4a01a25311530d53 Mon Sep 17 00:00:00 2001 From: vernesong <42875168+vernesong@users.noreply.github.com> Date: Wed, 6 Jan 2021 13:33:45 +0800 Subject: [PATCH] OpenClash: bump to v0.41.14-beta --- package/ctcgfw/luci-app-openclash/Makefile | 2 +- .../model/cbi/openclash/groups-config.lua | 2 +- .../model/cbi/openclash/other-rules-edit.lua | 11 +++++++++ .../po/zh-cn/openclash.zh-cn.po | 5 +++- .../root/etc/init.d/openclash | 24 ++++++++++--------- .../share/openclash/openclash_history_get.sh | 6 +++++ .../share/openclash/openclash_history_set.sh | 6 +++++ .../usr/share/openclash/openclash_watchdog.sh | 5 +++- .../root/usr/share/openclash/res/lhie1.yaml | 20 ++++++++++++++-- .../usr/share/openclash/res/openclash_version | 4 ++-- .../usr/share/openclash/yml_proxys_set.sh | 16 +++++++++++++ .../usr/share/openclash/yml_rules_change.sh | 4 ++++ 12 files changed, 86 insertions(+), 19 deletions(-) mode change 100644 => 100755 package/ctcgfw/luci-app-openclash/root/etc/init.d/openclash diff --git a/package/ctcgfw/luci-app-openclash/Makefile b/package/ctcgfw/luci-app-openclash/Makefile index 25cbdb543a..99f26fa2c1 100644 --- a/package/ctcgfw/luci-app-openclash/Makefile +++ b/package/ctcgfw/luci-app-openclash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-openclash -PKG_VERSION:=0.41.13 +PKG_VERSION:=0.41.14 PKG_RELEASE:=beta PKG_MAINTAINER:=vernesong diff --git a/package/ctcgfw/luci-app-openclash/luasrc/model/cbi/openclash/groups-config.lua b/package/ctcgfw/luci-app-openclash/luasrc/model/cbi/openclash/groups-config.lua index 062524445b..61c69a2bf2 100644 --- a/package/ctcgfw/luci-app-openclash/luasrc/model/cbi/openclash/groups-config.lua +++ b/package/ctcgfw/luci-app-openclash/luasrc/model/cbi/openclash/groups-config.lua @@ -52,7 +52,7 @@ end o = s:option(ListValue, "type", translate("Group Type")) o.rmempty = true o.description = translate("Choose The Operation Mode") -o:value("select", translate("Select")) +o:value("select", translate("Select　")) o:value("url-test", translate("URL-Test")) o:value("fallback", translate("Fallback")) o:value("load-balance", translate("Load-Balance")) diff --git a/package/ctcgfw/luci-app-openclash/luasrc/model/cbi/openclash/other-rules-edit.lua b/package/ctcgfw/luci-app-openclash/luasrc/model/cbi/openclash/other-rules-edit.lua index cf64d3c9b6..9e2f35fd98 100644 --- a/package/ctcgfw/luci-app-openclash/luasrc/model/cbi/openclash/other-rules-edit.lua +++ b/package/ctcgfw/luci-app-openclash/luasrc/model/cbi/openclash/other-rules-edit.lua @@ -152,6 +152,17 @@ end o:value("DIRECT") o:value("REJECT") +o = s:option(ListValue, "Disney", translate("Disney")) +o:depends("rule_name", "lhie1") +o.rmempty = true +for groupname in string.gmatch(groupnames, "([^'##\n']+)##") do + if groupname ~= nil and groupname ~= "" then + o:value(groupname) + end +end +o:value("DIRECT") +o:value("REJECT") + o = s:option(ListValue, "Spotify", translate("Spotify")) o:depends("rule_name", "lhie1") o.rmempty = true diff --git a/package/ctcgfw/luci-app-openclash/po/zh-cn/openclash.zh-cn.po b/package/ctcgfw/luci-app-openclash/po/zh-cn/openclash.zh-cn.po index a0ee35c7c5..0fb33bd8b3 100644 --- a/package/ctcgfw/luci-app-openclash/po/zh-cn/openclash.zh-cn.po +++ b/package/ctcgfw/luci-app-openclash/po/zh-cn/openclash.zh-cn.po @@ -490,6 +490,9 @@ msgstr "微软服务流量" msgid "Netflix" msgstr "Netflix流量" +msgid "Disney" +msgstr "Disney流量" + msgid "Spotify" msgstr "Spotify流量" @@ -783,7 +786,7 @@ msgstr "检测频率（秒）" msgid "Tolerance(ms)" msgstr "节点切换容忍值（毫秒）" -msgid "Select" +msgid "Select　" msgstr "Select【手动选择】" msgid "URL-Test" diff --git a/package/ctcgfw/luci-app-openclash/root/etc/init.d/openclash b/package/ctcgfw/luci-app-openclash/root/etc/init.d/openclash old mode 100644 new mode 100755 index 4d790de579..01cca803da --- a/package/ctcgfw/luci-app-openclash/root/etc/init.d/openclash +++ b/package/ctcgfw/luci-app-openclash/root/etc/init.d/openclash @@ -1197,17 +1197,18 @@ firewall_redirect_exclude() set_firewall() { -if [ "$(iptables -t nat -nL PREROUTING --line-number |grep "udp dpt:53" |grep "0.0.0.0/0 \{0,\}0.0.0.0/0" |wc -l)" -gt 1 ] && [ "$enable_redirect_dns" -eq 1 ]; then + +if [ "$enable_redirect_dns" -eq 1 ] && [ -z "$(iptables -t nat -nL PREROUTING --line-number |grep "redir ports 53$")"]; then + iptables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53 + iptables -t nat -A PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53 +fi + +if [ "$(iptables -t nat -nL PREROUTING --line-number |grep "redir ports 53" |wc -l)" -gt 2 ] && [ "$enable_redirect_dns" -eq 1 ]; then echo "发现53端口被劫持，清理防火墙规则..." >$START_LOG - pre_lines=$(iptables -nvL PREROUTING -t nat |sed 1,2d |sed -n '/0.0.0.0\/0 \{0,\}0.0.0.0\/0 \{0,\}udp dpt:53/=' 2>/dev/null |sort -rn) + pre_lines=$(iptables -nvL PREROUTING -t nat |sed 1,2d |sed -n '/redir ports 53/=' 2>/dev/null |sort -rn) for pre_line in $pre_lines; do iptables -t nat -D PREROUTING "$pre_line" >/dev/null 2>&1 done - iptables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53 >/dev/null 2>&1 - sleep 2 -elif [ "$enable_redirect_dns" -eq 1 ] && [ -z "$(iptables -t nat -nL PREROUTING --line-number |grep "redir ports 53$")"]; then - iptables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53 - iptables -t nat -A PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53 fi if [ -z "$(uci get firewall.openclash 2>/dev/null)" ] || [ -z "$(uci get ucitrack.@openclash[-1].init 2>/dev/null)" ]; then @@ -1313,12 +1314,11 @@ if [ -z "$en_mode_tun" ] || [ "$en_mode_tun" -eq 3 ]; then iptables -t nat -A openclash -m set --match-set china_ip_route dst -j RETURN >/dev/null 2>&1 fi iptables -t nat -A openclash -p tcp -j REDIRECT --to-ports "$proxy_port" - if [ -z "$en_mode_tun" ]; then - iptables -t nat -I PREROUTING -p tcp -d 8.8.8.8 --dport 53 -j REDIRECT --to-ports "$proxy_port" - iptables -t nat -I PREROUTING -p tcp -d 8.8.4.4 --dport 53 -j REDIRECT --to-ports "$proxy_port" - fi iptables -t nat -A PREROUTING -p tcp -j openclash if [ -z "$en_mode_tun" ]; then + #Google dns + iptables -t nat -I PREROUTING -p tcp -d 8.8.8.8 --dport 53 -j REDIRECT --to-ports "$proxy_port" + iptables -t nat -I PREROUTING -p tcp -d 8.8.4.4 --dport 53 -j REDIRECT --to-ports "$proxy_port" #udp if [ "$enable_udp_proxy" -eq 1 ]; then modprobe xt_TPROXY >/dev/null 2>&1 @@ -1754,6 +1754,8 @@ reload() do_run_mode 2>/dev/null get_config 2>/dev/null set_firewall 2>/dev/null + /etc/init.d/dnsmasq restart >/dev/null 2>&1 echo "${LOGTIME} Reload OpenClash Firewall Rules" >> $LOG_FILE + echo "" >$START_LOG fi } diff --git a/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/openclash_history_get.sh b/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/openclash_history_get.sh index 6e8a840dbd..861addc6fb 100755 --- a/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/openclash_history_get.sh +++ b/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/openclash_history_get.sh @@ -14,6 +14,12 @@ PORT=$(uci get openclash.config.cn_port 2>/dev/null) LOG_FILE="/tmp/openclash.log" LOGTIME=$(date "+%Y-%m-%d %H:%M:%S") +if [ -z "$CONFIG_FILE" ] || [ ! -f "$CONFIG_FILE" ]; then + CONFIG_FILE=$(uci get openclash.config.config_path 2>/dev/null) + CONFIG_NAME=$(echo "$CONFIG_FILE" |awk -F '/' '{print $5}' 2>/dev/null) + HISTORY_PATH="/etc/openclash/history/$CONFIG_NAME" +fi + if [ -n "$(pidof clash)" ] && [ -f "$CONFIG_FILE" ]; then curl -m 5 --retry 2 -w %{http_code}"\n" -H "Authorization: Bearer ${SECRET}" -H "Content-Type:application/json" -X GET http://"$LAN_IP":"$PORT"/proxies > "$CURL_CACHE" 2>/dev/null if [ "$(sed -n '$p' "$CURL_CACHE" 2>/dev/null)" = "200" ]; then diff --git a/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/openclash_history_set.sh b/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/openclash_history_set.sh index c98c754c2f..b3aebddd4a 100755 --- a/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/openclash_history_set.sh +++ b/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/openclash_history_set.sh @@ -43,6 +43,12 @@ close_all_conection() { curl -m 5 --retry 2 -H "Authorization: Bearer ${SECRET}" -H "Content-Type:application/json" -X DELETE http://"$LAN_IP":"$PORT"/connections >/dev/null 2>&1 } +if [ -z "$CONFIG_FILE" ] || [ ! -f "$CONFIG_FILE" ]; then + CONFIG_FILE=$(uci get openclash.config.config_path 2>/dev/null) + CONFIG_NAME=$(echo "$CONFIG_FILE" |awk -F '/' '{print $5}' 2>/dev/null) + HISTORY_PATH="/etc/openclash/history/$CONFIG_NAME" +fi + if [ -s "$HISTORY_PATH" ] && [ ! -z "$(pidof clash)" ]; then cat "$HISTORY_PATH" |while read -r line do diff --git a/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/openclash_watchdog.sh b/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/openclash_watchdog.sh index 77308d0b63..56df60e4a9 100755 --- a/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/openclash_watchdog.sh +++ b/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/openclash_watchdog.sh @@ -85,7 +85,10 @@ fi last_line=$(iptables -t nat -nL PREROUTING --line-number |awk '{print $1}' 2>/dev/null |awk 'END {print}' |sed -n '$p') op_line=$(iptables -t nat -nL PREROUTING --line-number |grep "openclash" 2>/dev/null |awk '{print $1}' 2>/dev/null |head -1) if [ "$last_line" != "$op_line" ] && [ -z "$core_type" ]; then - iptables -t nat -D PREROUTING -p tcp -j openclash + pre_lines=$(iptables -nvL PREROUTING -t nat |sed 1,2d |sed -n '/openclash/=' 2>/dev/null |sort -rn) + for pre_line in $pre_lines; do + iptables -t nat -D PREROUTING "$pre_line" >/dev/null 2>&1 + done >/dev/null 2>&1 iptables -t nat -A PREROUTING -p tcp -j openclash echo "$LOGTIME Watchdog: Reset Firewall For Enabling Redirect." >>$LOG_FILE fi diff --git a/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/res/lhie1.yaml b/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/res/lhie1.yaml index b63075d868..a7ee21f734 100644 --- a/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/res/lhie1.yaml +++ b/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/res/lhie1.yaml @@ -4,12 +4,14 @@ rules: - RULE-SET,Netflix,Netflix - RULE-SET,Spotify,Spotify - RULE-SET,YouTube,YouTube +- RULE-SET,Disney Plus,Disney - RULE-SET,Bilibili,AsianTV - RULE-SET,iQiyi,AsianTV - RULE-SET,Letv,AsianTV - RULE-SET,Netease Music,AsianTV - RULE-SET,Tencent Video,AsianTV - RULE-SET,Youku,AsianTV +- RULE-SET,WeTV,AsianTV - RULE-SET,ABC,GlobalTV - RULE-SET,Abema TV,GlobalTV - RULE-SET,Amazon,GlobalTV @@ -18,7 +20,7 @@ rules: - RULE-SET,Bahamut,GlobalTV - RULE-SET,BBC iPlayer,GlobalTV - RULE-SET,DAZN,GlobalTV -- RULE-SET,Disney Plus,GlobalTV +- RULE-SET,Discovery Plus,GlobalTV - RULE-SET,encoreTVB,GlobalTV - RULE-SET,Fox Now,GlobalTV - RULE-SET,Fox+,GlobalTV @@ -57,12 +59,14 @@ script: "Netflix": "Netflix", "Spotify": "Spotify", "YouTube": "YouTube", + "Disney Plus": "Disney", "Bilibili": "AsianTV", "iQiyi": "AsianTV", "Letv": "AsianTV", "Netease Music": "AsianTV", "Tencent Video": "AsianTV", "Youku": "AsianTV", + "WeTV": "AsianTV", "ABC": "GlobalTV", "Abema TV": "GlobalTV", "Amazon": "GlobalTV", @@ -71,7 +75,7 @@ script: "Bahamut": "GlobalTV", "BBC iPlayer": "GlobalTV", "DAZN": "GlobalTV", - "Disney Plus": "GlobalTV", + "Discovery Plus": "GlobalTV", "encoreTVB": "GlobalTV", "Fox Now": "GlobalTV", "Fox+": "GlobalTV", @@ -187,6 +191,12 @@ rule-providers: url: https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Clash/Provider/Media/Youku.yaml path: "./Rules/Media/Youku" interval: 86400 + WeTV: + type: http + behavior: classical + url: https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Clash/Provider/Media/WeTV.yaml + path: "./Rules/Media/WeTV" + interval: 86400 ABC: type: http behavior: classical @@ -235,6 +245,12 @@ rule-providers: url: https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Clash/Provider/Media/DAZN.yaml path: "./Rules/Media/DAZN" interval: 86400 + Discovery Plus: + type: http + behavior: classical + url: https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Clash/Provider/Media/Discovery%20Plus.yaml + path: "./Rules/Media/Discovery_Plus" + interval: 86400 Disney Plus: type: http behavior: classical diff --git a/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/res/openclash_version b/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/res/openclash_version index 291c2a415d..3ce5b71ede 100644 --- a/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/res/openclash_version +++ b/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/res/openclash_version @@ -1,2 +1,2 @@ -v0.41.13-beta -data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAYQAAAAqCAMAAACEAtzLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkFDMzkyQ0RDNDQ1MTExRUI4NjdBQTY3QjFBMTczMkI4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkFDMzkyQ0RENDQ1MTExRUI4NjdBQTY3QjFBMTczMkI4Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QUMzOTJDREE0NDUxMTFFQjg2N0FBNjdCMUExNzMyQjgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QUMzOTJDREI0NDUxMTFFQjg2N0FBNjdCMUExNzMyQjgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5OAPH3AAADAFBMVEWxytlISEgFXI5kq9OlpaWKiorh7/cihLw6lspJns6Gv98Fbakqjcbv9PcGXpGUxeEccaLR0dFjlbE9PT3R4uuenp6CgoLR5vJFgaIGVYLe3t61tbUVapo/Pz8GZp1ubm4Jca0GcKza2trn5+fOzs6StclFmsqRkZFFRUVLS0s1dZobhcFycnIkapKCrsd3d3eFhYUkeqoEU4CcnJwHVoRiYmJjnLy/v782kcasrKx4eHhWlrpFkb1YpdJ1tNmhoaHg4OBDQ0OizOVBQUEFZZsKdbOixtqy0eOUlJTCwsIIXIsKaqAFYJRqamq6urrIyMgEWYmz1urFxcUXYYxAQEAXgLzAwMA0fKYFaaK2trbKysoJYZMIZJjw9PcgdaZlZWVgYGCiwNLB2eekzubR3+gYbZ4JbaaDq8JUi6sJaJ50p8QFcrCNjY0GbKU1hrRIi7IHdLFkp81zn7kJWIWCqsAEYpivr690dHRHnMwFa6WJweKiv9GTvtZ0sdUmbphnrtYnisIJb6oBcrNZWVlTU1NRUVFUVFRVVVULfL0Ke7xSUlIFdrcHeLlWVlYDdbUOf8AEdrYDdLQDdLUEdbYOgMASg8MSg8QShMQThMUAcrIGd7hXV1cOf78Nfr8Nfr4Mfb4Mfb0Je7sJersIeboIebkJero6OjqqqqrV1dXU1NSrq6vC3u6pqanw9/s7OzuAgIB+fn719fWBgYGEvN2Evd3q6urB3u6DvNz09PTB1eDz8/OFvt5MTEyCss5/f3+CqcAIV4XB3e3B3e7g6vDC3++Fvd6EtNDo6OjA1N/g6u9Gm8vC3u+Fvd2Xl5cJeLjW1tZHm8xEmcpVos+Dr8iEq8IUXomCu9s3k8jB2+rC1eFEf6Gjo6PD3++DudcFdLSDsMmixNfB1+O4uLgwk8smh70vksvB1+QFZ5+RuM/C3OsKebkHd7ZGibCEscwmcZwCc7QRgsMPgMEQgcJaWlpfX19NTU1eXl5cXFxbW1tPT09QUFBYWFhdXV1OTk7///////90ZaeHAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAAC+FJREFUeNrsVwtYVGUaPoOAgDYI0ww3CVDEGS+ALKRSCiNYInlbo0DxkpphVGua3bay1hEZZHZrt70UXRbF4TrlKCAXC9Tymna/b2Wbu+1u7T0tNV72v5wz55yZwXi2nqdmHt/n4fzf9363//zvzDmD0N/vvHPCF/6ASb/zQXxyr6O/X+jP9Q8JiAi/9Ul8EtUvOCec8RNM+o1v4hOHcOcZvxHh1z6Ke4UJX/sLJv3LR/En4euLInzv8CcR/uOrEL70G1wU4QeApf/2VQhf+Q0uivBDEOFRX4XwX7/B0l/4KryKYJg6deotCd/9MS0zGJa5nASDYTA12YbswYrwxEB4dPjGsLBQ76GQ0OGyFxriNUlJh4aF3TttvHtGGMKe+P8hbHJHVokTDLnHszZ9SximGlS+E8dddgEWDabFy3h5kMOWPjkQwtn9BId4CU0DwlxOKP7grVxBr+RH4whzSwlD2IDTQ8NCn7wwPETIbgNGNen1yWSW4duKMBVTla5tMnJdWgNjv2MRnhoA3Vhy80+uuBqO8R6hEAfQLdrDNzrwgme1igYOjHljzAG5yDWi+6mBxw8c4xDOq5GVi64EHYVJ32U4/y1BRFD5CUCCaB5HV9VgWhh1xkEOW/q0dwwHxq0neBcrPUIOLEE3t9lH/AWPajX9bjTttF5AsDqrW+riBReKcQgex9aVpTNrTCajTmebM9jDTjOo9DIYEryLoBmNHNFsQEmft1pJLqmHLEKWwZCl/LioXSLC773iqekQ1q+emVgaDYdbaHwUIjvRzZ3uDz7qxAse5Wp6/frZawrXzI4G3LJol+GhIYreoaHDFTERoaHKHAnuIjihj9/MLJuJGg3YxbxdaBCvx3OBpvNNaMpqIk8uGm2iLxFnE8sDspjbkMUcDlf3zXq0yd8Jm7pWbn7ekEvLnNeRJk3gjdMaKNWQJmYmXEfdEuXWRzxdyTEeGM6tlQivrFyAN2ZSZzEQUqnCMdzQ+2d0c6e3t/cNHKt0h5penMiGXIED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 \ No newline at end of file +v0.41.14-beta +data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAYQAAAAqCAMAAACEAtzLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkRDN0NGMEEzNEZERDExRUI4OTNBQjE5MDVENEVFMEQ1IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkRDN0NGMEE0NEZERDExRUI4OTNBQjE5MDVENEVFMEQ1Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6REM3Q0YwQTE0RkREMTFFQjg5M0FCMTkwNUQ0RUUwRDUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6REM3Q0YwQTI0RkREMTFFQjg5M0FCMTkwNUQ0RUUwRDUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4d4xgdAAADAFBMVEVjlbGStcojhbxJns7h7/cFaaKUxeEccaLR0dEFbak9PT3R4uuenp6CgoKxytnv9PcHX5EGVYLe3t7R5vKGvt+1tbUVapo/Pz9ubm5Ui6va2trn5+c1dZrOzs4GZp0GcKyRkZFjnL1GRkZLS0uCrsdycnJFgKIJca1Fmsp3d3eFhYVFj7okeqqcnJwHVoQFZZtiYmIkapK/v7+srKx4eHgEU4AqjMWhoaHg4OBDQ0OizOVBQUFYpdJ1tdmixtqLi4uy0eOUlJTCwsIbhcFqamrw9Pe6urrIyMgHXI5XlbkJaqDFxcVAQEAXgLzAwMA0fKYEWYm2trYIZJnKysoXYYyiwNE7l8sJbaUFYJTR3+gIXI0gdaYIYpVlZWVmrdUKdbNgYGCz1urB2ecYbZ6np6eDq8I4lMiNjY0FcrCCqsCkzuaTvtavr682kcYEYph0dHRHnMyJweJzn7l0sdUmb5lortcnicA1h7UBcrNZWVlTU1NRUVFUVFRVVVUFdrdSUlILfL0Ke7wHeLkGd7hWVlYEdbYOgMAOf8AEdrYDdLUDdbUDdLQSg8MSg8QShMQThMUAcrIOf79XV1cNfr8Nfr4Mfb4Mfb0JersJe7sJeroIeboIebk6OjqqqqrV1dXC3u7U1NSrq6tISEipqanB3u7w9/s7OzuAgIB+fn6Evd319fVJSUmBgYGEvN3B1eDq6uqFvt709PTz8/ODvNxMTEwEXI6Css5/f3+CqcAIV4SlpaXB3e3B3e4JeLiEtNCFvd6Fvd3o6OjC3u/C3++Xl5dkqtKJiYnA1N8JWIXW1taDu9zg6u9Hm8xEmcpGm8sHdbKEq8Isj8fB1+M3k8iDr8hVos+DsMkUXonB2+qixNejo6PD3++Fudfg6vDB1+QFdLREf6EGXY8IaJ85lcm4uLgwk8vC3OsFZ6AKebmAudkHd7aEscwIWId1qMXC1eECc7QRgsMPgMEQgcJaWlpfX19NTU1eXl5cXFxbW1tPT09QUFBYWFhdXV1OTk7///////8d0mXsAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAAC25JREFUeNrsVwtYVGUaPgIqTDPEVfBC2BmUiy6ggjCiGXgrNkrUNDWv1S5Z2r3WEYOhabf2WlSrxjBcp2BQJlBL8FKa2l272MV2241at61t72mp8bL/5VxnBuPZ9nlq5vF9Hs7/fe//vd//n/89M2cQ+vrcN4/5Ihgw/jcBiBO3ufr6hL784LCAmPDrgMSJ2D7BPeZUkGD8rwITJ1zCzaeCxoRfBihuE8Z8HSwY/88AxQnh6/MmfOcIJhP+HagQvgwanDfhe4Cl/wpUCF8FDc6b8H0w4aeBCuE/QYOlPwtU+DXBNGnSpB8n/v+PaZnJtExJEk2mgWhyTDkDNeHhfvHGXXFxof6nFoa+oSahC/3WeNM6DUMc4h7+3yGs90Z2qRsM+Qez139LmCaZdLkbB5W4CPMH0uIlvDTAxZY+0h+GsPsJW+hnaioQpySh+J0/uTet03DE+TAaeVzoI+eGjwk5HmBEg9GYRLZt+rYmTMIkbWqfiHzFa2D0/9mER/tBHGb9bdzll8I1w2dqoYscqBS/cZcLz/uqfWitRl0i7tH+l+9/jkM4q0d2PjoTDRRmY6fp7LcEMUGXJwKJUngQnRUDaSEaxAEutvQx/5gMjHqxq+vFv2ONz5QLsxDHY/Zped5H7UNrNQrifJiBzXEIPsfWmW2wtJnNosFgnznQw0436fwymRL9m9A4EnlS6ERprz+tbJfcQzUh22TK1j4u+pSY8Fv/mIbIFxetSJ03Fi6vmRmxENrxFE+e+v077XjeR+1N6zRqFWUmh36sqQsNnayZkxAaqq2R4W2CG8aEDSyym2ngxFaWbYVTuh7MBxrONqAhu4F8c9HZBvoScTewOiCbpc5slnAo3TcY4VE/E3a9Vm1+1pRPZe4rSZMG8MbpTko506XKxCtpWqrd+tDHKjlmAJN5tAZDKitX4fUVNIkCPq7U4QCu7voDnuJJV1fX6zhQ6Q1vWqdRQA56ahh970zl+ccH6PYO0PXkQyBkGAtc3uJKoVqHrUB1hZyU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 \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/yml_proxys_set.sh b/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/yml_proxys_set.sh index bcf9149b44..a2d76b39ea 100755 --- a/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/yml_proxys_set.sh +++ b/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/yml_proxys_set.sh @@ -813,6 +813,20 @@ cat >> "$SERVER_FILE" <<-EOF EOF fi cat /tmp/Proxy_Provider >> $SERVER_FILE 2>/dev/null +cat >> "$SERVER_FILE" <<-EOF + - name: Disney + type: select + proxies: + - GlobalTV + - DIRECT +EOF +cat /tmp/Proxy_Server >> $SERVER_FILE 2>/dev/null +if [ -f "/tmp/Proxy_Provider" ]; then +cat >> "$SERVER_FILE" <<-EOF + use: +EOF +fi +cat /tmp/Proxy_Provider >> $SERVER_FILE 2>/dev/null cat >> "$SERVER_FILE" <<-EOF - name: Youtube type: select @@ -947,6 +961,7 @@ ${uci_set}Youtube="Youtube" ${uci_set}Apple="Apple" ${uci_set}Microsoft="Microsoft" ${uci_set}Netflix="Netflix" +${uci_set}Disney="Disney" ${uci_set}Spotify="Spotify" ${uci_set}Steam="Steam" ${uci_set}AdBlock="AdBlock" @@ -964,6 +979,7 @@ ${uci_set}Others="Others" ${UCI_DEL_LIST}="AsianTV" >/dev/null 2>&1 && ${UCI_ADD_LIST}="AsianTV" >/dev/null 2>&1 ${UCI_DEL_LIST}="GlobalTV" >/dev/null 2>&1 && ${UCI_ADD_LIST}="GlobalTV" >/dev/null 2>&1 ${UCI_DEL_LIST}="Netflix" >/dev/null 2>&1 && ${UCI_ADD_LIST}="Netflix" >/dev/null 2>&1 + ${UCI_DEL_LIST}="Disney" >/dev/null 2>&1 && ${UCI_ADD_LIST}="Disney" >/dev/null 2>&1 ${UCI_DEL_LIST}="Spotify" >/dev/null 2>&1 && ${UCI_ADD_LIST}="Spotify" >/dev/null 2>&1 ${UCI_DEL_LIST}="Steam" >/dev/null 2>&1 && ${UCI_ADD_LIST}="Steam" >/dev/null 2>&1 ${UCI_DEL_LIST}="Telegram" >/dev/null 2>&1 && ${UCI_ADD_LIST}="Telegram" >/dev/null 2>&1 diff --git a/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/yml_rules_change.sh b/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/yml_rules_change.sh index 63d6715c0a..a6358fa7f3 100755 --- a/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/yml_rules_change.sh +++ b/package/ctcgfw/luci-app-openclash/root/usr/share/openclash/yml_rules_change.sh @@ -137,6 +137,7 @@ yml_other_rules_get() config_get "Youtube" "$section" "Youtube" "" config_get "Apple" "$section" "Apple" "" config_get "Netflix" "$section" "Netflix" "" + config_get "Disney" "$section" "Disney" "" config_get "Spotify" "$section" "Spotify" "" config_get "Steam" "$section" "Steam" "" config_get "AdBlock" "$section" "AdBlock" "" @@ -180,6 +181,7 @@ if [ "$2" != "0" ]; then || [ -z "$(grep -F "$Youtube" /tmp/Proxy_Group)" ]\ || [ -z "$(grep -F "$Apple" /tmp/Proxy_Group)" ]\ || [ -z "$(grep -F "$Netflix" /tmp/Proxy_Group)" ]\ + || [ -z "$(grep -F "$Disney" /tmp/Proxy_Group)" ]\ || [ -z "$(grep -F "$Spotify" /tmp/Proxy_Group)" ]\ || [ -z "$(grep -F "$Steam" /tmp/Proxy_Group)" ]\ || [ -z "$(grep -F "$AdBlock" /tmp/Proxy_Group)" ]\ @@ -227,6 +229,7 @@ if [ "$2" != "0" ]; then .gsub(/,YouTube$/, ',$Youtube#d') .gsub(/,Apple$/, ',$Apple#d') .gsub(/,Netflix$/, ',$Netflix#d') + .gsub(/,Disney$/, ',$Disney#d') .gsub(/,Spotify$/, ',$Spotify#d') .gsub(/,Steam$/, ',$Steam#d') .gsub(/,AdBlock$/, ',$AdBlock#d') @@ -244,6 +247,7 @@ if [ "$2" != "0" ]; then .gsub!(/: \"YouTube\"/,': \"$Youtube#d\"') .gsub!(/: \"Apple\"/,': \"$Apple#d\"') .gsub!(/: \"Netflix\"/,': \"$Netflix#d\"') + .gsub!(/: \"Disney\"/,': \"$Disney#d\"') .gsub!(/: \"Spotify\"/,': \"$Spotify#d\"') .gsub!(/: \"Steam\"/,': \"$Steam#d\"') .gsub!(/: \"AdBlock\"/,': \"$AdBlock#d\"')