mirror of
https://github.com/ACL4SSR/ACL4SSR.git
synced 2026-06-10 14:32:32 +00:00
fix some bugs
This commit is contained in:
@@ -113,6 +113,12 @@ def parse_gfwlist(content):
|
|||||||
if not line or line.startswith('!') or line.startswith('['):
|
if not line or line.startswith('!') or line.startswith('['):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
# 忽略特定的无效规则
|
||||||
|
if line == '||addons.mozilla.org/*-*/firefox/addon/ublock-origin/*':
|
||||||
|
continue
|
||||||
|
if line == '||addons.mozilla.org/firefox/downloads/file/*/ublock_origin-*.xpi':
|
||||||
|
continue
|
||||||
|
|
||||||
if line.startswith('@@||'):
|
if line.startswith('@@||'):
|
||||||
rule = line[4:]
|
rule = line[4:]
|
||||||
if rule.endswith('^'):
|
if rule.endswith('^'):
|
||||||
@@ -220,12 +226,14 @@ def generate_clash_provider_yaml(domain_list, ip_list, filename, title="payload"
|
|||||||
# 生成分离的临时文件用于 mrs 转换
|
# 生成分离的临时文件用于 mrs 转换
|
||||||
base_name = filename.replace('.yaml', '')
|
base_name = filename.replace('.yaml', '')
|
||||||
# 域名规则 - YAML 格式
|
# 域名规则 - YAML 格式
|
||||||
|
if unique_domains:
|
||||||
domain_yaml = f"{title}:\n"
|
domain_yaml = f"{title}:\n"
|
||||||
for domain in unique_domains:
|
for domain in unique_domains:
|
||||||
domain_yaml += f" - DOMAIN-SUFFIX,{domain}\n"
|
domain_yaml += f" - DOMAIN-SUFFIX,{domain}\n"
|
||||||
write_file(f"{base_name}_domain.yaml", domain_yaml)
|
write_file(f"{base_name}_domain.yaml", domain_yaml)
|
||||||
|
|
||||||
# IP 规则 - YAML 格式
|
# IP 规则 - YAML 格式
|
||||||
|
if ip_rules:
|
||||||
ip_yaml = f"{title}:\n"
|
ip_yaml = f"{title}:\n"
|
||||||
for rule in ip_rules:
|
for rule in ip_rules:
|
||||||
ip_yaml += f" - {rule}\n"
|
ip_yaml += f" - {rule}\n"
|
||||||
@@ -245,12 +253,14 @@ def generate_clash_ruleset_list(domain_list, ip_list, filename, title="GFWList")
|
|||||||
# 生成分离的临时文件用于 mrs 转换
|
# 生成分离的临时文件用于 mrs 转换
|
||||||
base_name = filename.replace('.list', '')
|
base_name = filename.replace('.list', '')
|
||||||
# 域名规则 - text 格式
|
# 域名规则 - text 格式
|
||||||
|
if unique_domains:
|
||||||
domain_text = ""
|
domain_text = ""
|
||||||
for domain in unique_domains:
|
for domain in unique_domains:
|
||||||
domain_text += f"DOMAIN-SUFFIX,{domain}\n"
|
domain_text += f"DOMAIN-SUFFIX,{domain}\n"
|
||||||
write_file(f"{base_name}_domain.list", domain_text)
|
write_file(f"{base_name}_domain.list", domain_text)
|
||||||
|
|
||||||
# IP 规则 - text 格式
|
# IP 规则 - text 格式
|
||||||
|
if ip_rules:
|
||||||
ip_text = ""
|
ip_text = ""
|
||||||
for rule in ip_rules:
|
for rule in ip_rules:
|
||||||
ip_text += f"{rule}\n"
|
ip_text += f"{rule}\n"
|
||||||
|
|||||||
Reference in New Issue
Block a user