diff --git a/factory/gfwlist.py b/factory/gfwlist.py index 9686d0f..8df561f 100644 --- a/factory/gfwlist.py +++ b/factory/gfwlist.py @@ -4,6 +4,8 @@ # 下载并解析最新版本的 GFWList # 对于混合性质的网站,尽量走代理(忽略了所有的@@指令) # +# 从 https://github.com/Loyalsoldier/cn-blocked-domain 中获取GFWList的补充 +# import time @@ -86,7 +88,10 @@ def filtrate_rules(rules): return ret - +# 从 https://github.com/Loyalsoldier/cn-blocked-domain 中获取GFWList的补充 +def getURLs(url): + r = requests.get(url) + return r.text.split("\n")[:-1] # main @@ -96,6 +101,10 @@ rules = clear_format(rule) rules = filtrate_rules(rules) +rules.extend(getURLs('https://raw.githubusercontent.com/Loyalsoldier/cn-blocked-domain/release/domains.txt')) +rules.extend('https://raw.githubusercontent.com/Loyalsoldier/cn-blocked-domain/release/ip.txt') +rules = list( set(rules) ) + open('resultant/gfw.list', 'w', encoding='utf-8') \ .write('\n'.join(rules))