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

Update list_merge.py

Browse Source
This commit is contained in:
Mirei 2022-10-04 18:37:28 +03:30 committed by GitHub
parent af91a5bc9d
commit 09be3545ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
utils/list_merge.py
View File

@ -84,6 +84,8 @@ class sub_merge():
# content = content_raw
#############################
# print('Merging nodes...\n')
# content_raw = ''.join(content_list) # https://python3-cookbook.readthedocs.io/zh_CN/latest/c02/p14_combine_and_concatenate_strings.html
@ -100,6 +102,22 @@ class sub_merge():
###############################
# print('Merging nodes...\n')
# content_raw = ''.join(content_list)
# # content_yaml = sub_convert.main(content_raw, 'content', 'content', {
# # 'dup_rm_enabled': True, 'format_name_enabled': True})
# final_content = sub_convert.makeup(
# content_raw, True, True)
# content_raw = sub_convert.yaml_decode(final_content)
# content_yaml = sub_convert.main(content_raw, 'content', 'YAML', {
# 'dup_rm_enabled': True, 'format_name_enabled': True})
# content_base64 = sub_convert.base64_encode(content_raw)
# content = content_raw
print('Merging nodes...\n')
content_raw = ''.join(content_list)
# content_yaml = sub_convert.main(content_raw, 'content', 'content', {
@ -111,10 +129,15 @@ class sub_merge():
content_yaml = sub_convert.main(content_raw, 'content', 'YAML', {
'dup_rm_enabled': True, 'format_name_enabled': True})
# content_yaml = final_content
content_raw = sub_convert.yaml_decode(content_yaml)
content_base64 = sub_convert.base64_encode(content_raw)
content = content_raw
##############################
def content_write(file, output_type):