Backups/immortalwrt-mt798x
1
0
Fork 0
mirror of https://github.com/hanwckf/immortalwrt-mt798x.git synced 2025-01-08 10:23:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

OpenClash: bump to 0.39.2-beta

Browse Source
This commit is contained in:
CN_SZTL 2020-06-21 00:29:53 +08:00
parent 8913bda191
commit 34eb0d9cc1
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
10 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/ctcgfw/luci-app-openclash/files/etc/openclash/rule_providers.list
View File

@ -1,15 +1,24 @@
反劫持规则,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Guard/,Hijacking.yaml
国内IP合集,rixCloud-Inc,ipcidr,rixCloud-Inc/Clash-Ruleset/master/,Domestic_IP.rule,Domestic_IP.yaml
国内IP白名单,ConnersHua,ipcidr,DivineEngine/Profiles/master/Clash/RuleSet/Extra/,ChinaIP.yaml
国内常用域名,rixCloud-Inc,domain,rixCloud-Inc/Clash-Ruleset/master/,Domestic_Domain.rule,Domestic_Domain.yaml
国内域名白名单,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/,China.yaml
国内流媒体合集,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/,StreamingCN.yaml
国内流媒体国际版合集,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/,StreamingSE.yaml
国外IP代理合集,rixCloud-Inc,ipcidr,rixCloud-Inc/Clash-Ruleset/master/,Global_IP.rule,Global_IP.yaml
国外域名代理合集,rixCloud-Inc,domain,rixCloud-Inc/Clash-Ruleset/master/,Global_Domain.rule,Global_Domain.yaml
国外常用网站合集,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/,Global.yaml
国外流媒体合集,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/,Streaming.yaml
国外流媒体（IP）合集,rixCloud-Inc,ipcidr,rixCloud-Inc/Clash-Ruleset/master/,Stream_IP.rule,Stream_IP.yaml
国外流媒体（域名）合集,rixCloud-Inc,domain,rixCloud-Inc/Clash-Ruleset/master/,Stream_Domain.rule,Stream_Domain.yaml
学术网站,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/,Scholar.yaml
常用隐私规则,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/,Unbreak.yaml
广告规则,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Guard/,Advertising.yaml
广告（IP）合集,rixCloud-Inc,ipcidr,rixCloud-Inc/Clash-Ruleset/master/,Reject_IP.rule,Reject_IP.yaml
广告（域名）合集,rixCloud-Inc,domain,rixCloud-Inc/Clash-Ruleset/master/,Reject_Domain.rule,Reject_Domain.yaml
网易云音乐域名,rixCloud-Inc,domain,rixCloud-Inc/Clash-Ruleset/master/,Netease_Music_Domains.rule,Netease_Music_Domains.yaml
苹果服务合集,rixCloud-Inc,domain,rixCloud-Inc/Clash-Ruleset/master/,Apple_Domain.rule,Apple_Domain.yaml
隐私规则合集,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Guard/,Privacy.yaml
GFW地址,ConnersHua,ipcidr,DivineEngine/Profiles/master/Clash/RuleSet/Extra/,IP-Blackhole.yaml
AbemaTV,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,AbemaTV.yaml
All-4,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,All-4.yaml
AppStore,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/Apple/,AppStore.yaml
@ -28,6 +37,7 @@ DAZN,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMe
Deezer,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Music/,Deezer.yaml
DisneyPlus,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,DisneyPlus.yaml
FOX,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,FOX.yaml
GFW地址,ConnersHua,ipcidr,DivineEngine/Profiles/master/Clash/RuleSet/Extra/,IP-Blackhole.yaml
GoogleDrive,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/Google/,GoogleDrive.yaml
GoogleSearch,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/Extra/Google/,GoogleSearch.yaml
HBO,ConnersHua,classical,DivineEngine/Profiles/master/Clash/RuleSet/StreamingMedia/Video/,HBO.yaml

13
package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/rule-providers-manage.lua
View File

@ -39,6 +39,16 @@ if not NXFS.access("/tmp/rule_providers_name") then
end
file = io.open("/tmp/rule_providers_name", "r");
local function i(e)
local t=0
local a={' KB',' MB',' GB',' TB'}
repeat
e=e/1024
t=t+1
until(e<=1024)
return string.format("%.1f",e)..a[t]
end
---- Rules List
local e={},o,t
if NXFS.access("/tmp/rule_providers_name") then
@ -57,8 +67,10 @@ e[t].author=string.sub(luci.sys.exec(string.format("grep -F ',%s' /etc/openclash
e[t].rule_type=string.sub(luci.sys.exec(string.format("grep -F ',%s' /etc/openclash/rule_providers.list |awk -F ',' '{print $3}' 2>/dev/null",o)),1,-2)
RULE_FILE="/etc/openclash/rule_provider/".. e[t].filename
if fs.mtime(RULE_FILE) then
e[t].size=i(fs.stat(RULE_FILE).size)
e[t].mtime=os.date("%Y-%m-%d %H:%M:%S",fs.mtime(RULE_FILE))
else
e[t].size="/"
e[t].mtime="/"
end
if fs.isfile(RULE_FILE) then
@ -82,6 +94,7 @@ tp=tb:option(DummyValue,"rule_type",translate("Rule Type"))
nm=tb:option(DummyValue,"name",translate("Rule Name"))
au=tb:option(DummyValue,"author",translate("Rule Author"))
fm=tb:option(DummyValue,"filename",translate("File Name"))
sz=tb:option(DummyValue,"size",translate("Size"))
mt=tb:option(DummyValue,"mtime",translate("Update Time"))
btnis=tb:option(DummyValue,"filename",translate("Download Rule"))

2
package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/index.html
View File

@ -1 +1 @@
<!doctype html><html lang="en" dir="ltr"><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><link rel="icon" type="image/x-icon" href="https://cdn.jsdelivr.net/gh/Dreamacro/clash/docs/logo.png"/><title>Clash</title><link href="main.22aafef55a2ae3675d94.css" rel="stylesheet"></head><body><div id="root"></div><script src="js/1.bundle.22aafef55a2ae3675d94.min.js"></script><script src="js/bundle.22aafef55a2ae3675d94.min.js"></script></body></html>
<!doctype html><html lang="en" dir="ltr"><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><link rel="icon" type="image/x-icon" href="https://cdn.jsdelivr.net/gh/Dreamacro/clash/docs/logo.png"/><title>Clash</title><link href="main.592d9cc6ea35f4c8ca4d.css" rel="stylesheet"></head><body><div id="root"></div><script src="js/1.bundle.592d9cc6ea35f4c8ca4d.min.js"></script><script src="js/bundle.592d9cc6ea35f4c8ca4d.min.js"></script></body></html>

2
package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/1.bundle.22aafef55a2ae3675d94.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/1.bundle.592d9cc6ea35f4c8ca4d.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

0
package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/1.bundle.22aafef55a2ae3675d94.min.js.LICENSE.txt → package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/1.bundle.592d9cc6ea35f4c8ca4d.min.js.LICENSE.txt
View File

1
package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/bundle.22aafef55a2ae3675d94.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/js/bundle.592d9cc6ea35f4c8ca4d.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

0
package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/main.22aafef55a2ae3675d94.css → package/ctcgfw/luci-app-openclash/files/usr/share/openclash/dashboard/main.592d9cc6ea35f4c8ca4d.css
View File

27
package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yml_change.sh
View File

@ -27,7 +27,7 @@
if [ ! -z "$(grep "^ \{0,\}fake-ip-range:" "$7")" ]; then
sed -i "/^ \{0,\}fake-ip-range:/c\ fake-ip-range: 198.18.0.1/16" "$7"
else
sed -i "/enhanced-mode:/a\ fake-ip-range: 198.18.0.1/16" "$7"
sed -i "/^ \{0,\}enhanced-mode:/a\ fake-ip-range: 198.18.0.1/16" "$7"
fi
fi
else
@ -160,22 +160,15 @@
fi
if [ "$8" -eq 1 ]; then
if [ -z "$(grep "^ ipv6: true" "$7")" ]; then
if [ ! -z "$(grep "^ \{0,\}ipv6:" "$7")" ]; then
sed -i "/^ \{0,\}ipv6:/c\ ipv6: true" "$7"
else
sed -i "/^ \{0,\}enable: true/i\ ipv6: true" "$7"
fi
fi
sed -i '/^ \{0,\}ipv6:/d' "$7" 2>/dev/null
sed -i "/^ \{0,\}enable: true/a\ ipv6: true" "$7"
sed -i "/^ \{0,\}mode:/i\ipv6: true" "$7"
else
if [ -z "$(grep "^ ipv6: false" "$7")" ]; then
if [ ! -z "$(grep "^ \{0,\}ipv6:" "$7")" ]; then
sed -i "/^ \{0,\}ipv6:/c\ ipv6: false" "$7"
else
sed -i "/^ \{0,\}enable: true/a\ ipv6: false" "$7"
fi
fi
sed -i '/^ \{0,\}ipv6:/d' "$7" 2>/dev/null
sed -i "/^ \{0,\}enable: true/a\ ipv6: false" "$7"
sed -i "/^ \{0,\}mode:/i\ipv6: false" "$7"
fi
#TUN
if [ "$15" -eq 1 ]; then
sed -i "/^dns:/i\tun:" "$7"
@ -231,10 +224,10 @@
if [ -s "/etc/openclash/fake_filter.list" ]; then
if [ ! -z "$(grep "^ \{0,\}fake-ip-filter:" "$7")" ]; then
sed -i "/^ \{0,\}fake-ip-filter:/c\ fake-ip-filter:" "$7"
sed -i '/fake-ip-filter:/r/etc/openclash/fake_filter.list' "$7" 2>/dev/null
sed -i '/^ \{0,\}fake-ip-filter:/r/etc/openclash/fake_filter.list' "$7" 2>/dev/null
else
echo " fake-ip-filter:" >> "$7"
sed -i '/fake-ip-filter:/r/etc/openclash/fake_filter.list' "$7" 2>/dev/null
sed -i '/^ \{0,\}fake-ip-filter:/r/etc/openclash/fake_filter.list' "$7" 2>/dev/null
fi
fi
fi