mirror/Johnshall-Shadowrocket-ADBlock-Rules-Forever
1
0
Fork 0
mirror of https://github.com/Johnshall/Shadowrocket-ADBlock-Rules-Forever.git synced 2025-12-17 23:34:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

🥕 Fix type err

Browse Source
This commit is contained in:
Johnshall
2022-08-24 22:45:58 +08:00
committed by GitHub
parent ca622d39f2
commit 4d5e11bed1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
factory/gfwlist.py
View File

@@ -38,6 +38,8 @@ def get_rule(rules_url, ruleType='raw'):
rule = base64.b64decode(r.text) \ rule = base64.b64decode(r.text) \
.decode("utf-8") \ .decode("utf-8") \
.replace('\\n', '\n') .replace('\\n', '\n')
else:
rule = r.text
return rule return rule
@@ -99,7 +101,7 @@ def getURLs(url):
rule = get_rule(rules_url='https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt', ruleType='base64') rule = get_rule(rules_url='https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt', ruleType='base64')
# 从 https://github.com/Johnshall/cn-blocked-domain 中获取GFWList的补充 # 从 https://github.com/Johnshall/cn-blocked-domain 中获取GFWList的补充
rules.extend(getURLs('https://raw.githubusercontent.com/Johnshall/cn-blocked-domain/release/domains.txt')) rule += get_rule('https://raw.githubusercontent.com/Johnshall/cn-blocked-domain/release/domains.txt')
rules = clear_format(rule) rules = clear_format(rule)