littlebalalafairy/sing-box-geosite
1
0
Fork 0
mirror of https://github.com/Toperlock/sing-box-geosite.git synced 2025-06-08 01:32:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复获取链接错误

Browse Source
This commit is contained in:
Dorae 2024-09-20 14:52:25 +08:00 committed by GitHub
parent 7f399bb714
commit 95e6d327b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
main.py
View File

@ -6,22 +6,30 @@ import json
import requests import requests
import yaml import yaml
import ipaddress import ipaddress
from io import StringIO
# 映射字典 # 映射字典
MAP_DICT = {'DOMAIN-SUFFIX': 'domain_suffix', 'HOST-SUFFIX': 'domain_suffix', 'DOMAIN': 'domain', 'HOST': 'domain', 'host': 'domain', MAP_DICT = {'DOMAIN-SUFFIX': 'domain_suffix', 'HOST-SUFFIX': 'domain_suffix', 'host-suffix': 'domain_suffix', 'DOMAIN': 'domain', 'HOST': 'domain', 'host': 'domain',
'DOMAIN-KEYWORD':'domain_keyword', 'HOST-KEYWORD': 'domain_keyword', 'host-keyword': 'domain_keyword', 'IP-CIDR': 'ip_cidr', 'DOMAIN-KEYWORD':'domain_keyword', 'HOST-KEYWORD': 'domain_keyword', 'host-keyword': 'domain_keyword', 'IP-CIDR': 'ip_cidr',
'ip-cidr': 'ip_cidr', 'IP-CIDR6': 'ip_cidr', 'ip-cidr': 'ip_cidr', 'IP-CIDR6': 'ip_cidr',
'IP6-CIDR': 'ip_cidr','SRC-IP-CIDR': 'source_ip_cidr', 'GEOIP': 'geoip', 'DST-PORT': 'port', 'IP6-CIDR': 'ip_cidr','SRC-IP-CIDR': 'source_ip_cidr', 'GEOIP': 'geoip', 'DST-PORT': 'port',
'SRC-PORT': 'source_port', "URL-REGEX": "domain_regex", "DOMAIN-REGEX": "domain_regex"} 'SRC-PORT': 'source_port', "URL-REGEX": "domain_regex", "DOMAIN-REGEX": "domain_regex"}
def read_yaml_from_url(url): def read_yaml_from_url(url):
response = requests.get(url) headers = {'User-Agent': 'Mozilla/5.0'}
response = requests.get(url, headers=headers)
response.raise_for_status() response.raise_for_status()
yaml_data = yaml.safe_load(response.text) yaml_data = yaml.safe_load(response.text)
return yaml_data return yaml_data
def read_list_from_url(url): def read_list_from_url(url):
df = pd.read_csv(url, header=None, names=['pattern', 'address', 'other', 'other2', 'other3']) headers = {'User-Agent': 'Mozilla/5.0'}
response = requests.get(url, headers=headers)
if response.status_code == 200:
csv_data = StringIO(response.text)
df = pd.read_csv(csv_data, header=None, names=['pattern', 'address', 'other', 'other2', 'other3'], on_bad_lines='skip')
else:
return None
filtered_rows = [] filtered_rows = []
rules = [] rules = []
# 处理逻辑规则 # 处理逻辑规则
@ -90,7 +98,7 @@ def parse_and_convert_to_dataframe(link):
pattern = 'DOMAIN' pattern = 'DOMAIN'
else: else:
pattern, address = item.split(',', 1) pattern, address = item.split(',', 1)
if pattern == "IP-CIDR" and "no-resolve" in address: if ',' in address:
address = address.split(',', 1)[0] address = address.split(',', 1)[0]
rows.append({'pattern': pattern.strip(), 'address': address.strip(), 'other': None}) rows.append({'pattern': pattern.strip(), 'address': address.strip(), 'other': None})
df = pd.DataFrame(rows, columns=['pattern', 'address', 'other']) df = pd.DataFrame(rows, columns=['pattern', 'address', 'other'])
@ -157,8 +165,8 @@ def parse_list_file(link, output_directory):
srs_path = file_name.replace(".json", ".srs") srs_path = file_name.replace(".json", ".srs")
os.system(f"sing-box rule-set compile --output {srs_path} {file_name}") os.system(f"sing-box rule-set compile --output {srs_path} {file_name}")
return file_name return file_name
except: except Exception as e:
print(f'获取链接出错，已跳过：{link}') print(f'获取链接出错，已跳过：{link}，原因：{str(e)}')
pass pass
# 读取 links.txt 中的每个链接并生成对应的 JSON 文件 # 读取 links.txt 中的每个链接并生成对应的 JSON 文件