feat: 去重合并

Author: dontdot

trackerslist.py

@@ -1,10 +1,12 @@
+from typing import LiteralString
 import requests
 from datetime import datetime
 
 # 要下载的文件链接列表
 urls = [
     "https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all.txt",
     "https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all_ip.txt",
+    "https://cf.trackerslist.com/all.txt"
 ]
 
 # 下载文件并保存到内存中
@@ -13,19 +15,20 @@ def download_file(url):
     return response.content
 
 # 合并文件并去除空行
-def merge_files(contents):
-    merged_content = ""
-    for content in contents:
-        lines = content.decode().split("\n")
+def merge_files(contents: list) -> str:
+    _content: set = set()                                   # 创建一个空的集合，达到去重的作用
+    for content in contents:                                # contents: list : [str\n\n, str\n\n]
+        lines: list = content.decode().split("\n")          # content: str : str\n
         for line in lines:
             line = line.strip()  # 去除首尾空格和换行符
             if line:  # 如果不是空行则加入合并内容
-                merged_content += line + "\n"
+                _content.add(line)
+    merged_content = "\n".join(_content) + "\n"
     return merged_content
 
 # 下载文件并保存到内存中
-file_contents = []
-for url in urls:
+file_contents: list = []
+for i, url in enumerate(urls):
     file_content = download_file(url)
     file_contents.append(file_content)