CodeCow/V2RayAggregator
1
0
Fork 0
mirror of https://github.com/mahdibland/V2RayAggregator.git synced 2026-06-24 21:34:12 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix log name

Browse Source
This commit is contained in:
Mirei 2022-10-28 13:25:16 +03:30
parent 6bb86f1c7c
commit f558a22174
1 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
utils/eternity_convert_airport.py
View File

@ -45,9 +45,32 @@ def eternity_convert(file, config, output, provider_file_enabled=True):
all_provider = subs_function.convert_sub(
"https://raw.githubusercontent.com/mahdibland/SSAggregator/master/EternityAir", 'clash', "http://0.0.0.0:25500", False, extra_options="&udp=false")
########## Add Name to Logs Before making chaages to Proxies ############
temp_providers = all_provider.split('\n')
log_reader = open(log_file, 'r')
log_lines = log_reader.readlines()
log_reader.close()
indexx = 0
for line in temp_providers:
if line != 'proxies:':
#####
server_name = substrings(line, "name:", ",")
server_type = substrings(line, "type:", ",")
log_lines[indexx] = "name: %s | type: %s | %s" % (
server_name, server_type, log_lines[indexx])
#####
indexx += 1
log_writer = open(log_file, 'w')
log_writer.writelines(log_lines)
log_writer.close()
############################################################################
# remove lines with name issue
removed_bad_char = list(filter(lambda x: str(x).__contains__(
"<EFBFBD>") == False, all_provider.split("\n")[1:]))
log_lines_without_bad_char = list(filter(lambda x: str(x).__contains__(
"<EFBFBD>") == False, log_lines))
# take a part from begining of all lines
num = 200
@ -57,42 +80,27 @@ def eternity_convert(file, config, output, provider_file_enabled=True):
all_provider = "proxies:\n" + "\n".join(removed_bad_char[0:num + 1])
lines = re.split(r'\n+', all_provider)
# 创建并写入 provider
proxy_all = []
log_reader = open(log_file, 'r')
log_lines = log_reader.readlines()
log_reader.close()
proxy_all = []
indexx = 0
for line in lines:
if line != 'proxies:':
#####
server_name = substrings(line, "name:", ",")
server_type = substrings(line, "type:", ",")
log_lines[indexx] = "name: %s | type: %s | %s" % (
server_name, server_type, log_lines[indexx])
#####
try:
name = substrings(line, "name:", ",")
speed = substrings(log_lines[indexx], "avg_speed:", "|")
speed = substrings(
log_lines_without_bad_char[indexx], "avg_speed:", "|")
line = re.sub("name:( |)(.*?),", "name: %s | %s," %
(name, speed), line)
except:
print(log_lines[indexx])
print(log_lines_without_bad_char[indexx])
pass
# line = ' ' + line
# line = ' ' + line
line = line.replace('- ', '')
linee = yaml.safe_load(line)
proxy_all.append(linee)
indexx += 1
#####
log_writer = open(log_file, 'w')
log_writer.writelines(log_lines)
log_writer.close()
#####
if provider_file_enabled:
providers_files = {
'all': provider_path + 'provider-all-airport.yml',
@ -133,12 +141,13 @@ def eternity_convert(file, config, output, provider_file_enabled=True):
if not provider_dic[key]['proxies'] is None:
for proxy in provider_dic[key]['proxies']:
try:
speed = substrings(log_lines[indexx], "avg_speed:", "|")
speed = substrings(
log_lines_without_bad_char[indexx], "avg_speed:", "|")
name_dict[key].append(
str(proxy['name']).replace(" ", "") + " | " + speed)
except:
name_dict[key].append(str(proxy['name']).replace(" ", ""))
print(log_lines[indexx])
print(log_lines_without_bad_char[indexx])
indexx += 1