Update 网络收集.py
This commit is contained in:
+18
-3
@@ -652,9 +652,10 @@ def parse_file(input_file_path, output_file_name): #
|
|||||||
return
|
return
|
||||||
# 合并所有满足条件的IP或域名的行到一个文件
|
# 合并所有满足条件的IP或域名的行到一个文件
|
||||||
############################################################
|
############################################################
|
||||||
alphabet_counter = -1
|
|
||||||
number_counter = -1
|
alphabet_counter = -1
|
||||||
with open(output_file_name, 'w', encoding='utf-8') as output_file:
|
number_counter = -1
|
||||||
|
with open(output_file_name, 'w', encoding='utf-8') as output_file: #output_
|
||||||
for ip_or_domain, lines in filtered_ip_or_domain_to_lines.items():
|
for ip_or_domain, lines in filtered_ip_or_domain_to_lines.items():
|
||||||
# 检查是否需要递增数字计数器
|
# 检查是否需要递增数字计数器
|
||||||
if alphabet_counter >= 26:
|
if alphabet_counter >= 26:
|
||||||
@@ -677,6 +678,20 @@ with open(output_file_name, 'w', encoding='utf-8') as output_file:
|
|||||||
parse_file('网络收集.txt', '网络收集.txt')
|
parse_file('网络收集.txt', '网络收集.txt')
|
||||||
|
|
||||||
|
|
||||||
|
def append_text_between_files(file1_path, file2_path):
|
||||||
|
with open(file1_path, 'r', encoding='utf-8') as file1:
|
||||||
|
content1 = file1.read()
|
||||||
|
with open(file2_path, 'a', encoding='utf-8') as file2:
|
||||||
|
if file2.tell()!= 0:
|
||||||
|
file2.write('\n')
|
||||||
|
file2.write(content1)
|
||||||
|
|
||||||
|
file_path1 = '网络收集.txt'
|
||||||
|
file_path2 = '综合源.txt'
|
||||||
|
append_text_between_files(file_path1, file_path2)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import datetime
|
import datetime
|
||||||
now = datetime.datetime.utcnow() + datetime.timedelta(hours=8)
|
now = datetime.datetime.utcnow() + datetime.timedelta(hours=8)
|
||||||
current_time = now.strftime("%m/%d %H:%M")
|
current_time = now.strftime("%m/%d %H:%M")
|
||||||
|
|||||||
Reference in New Issue
Block a user