1414from ..logging_config import get_logger
1515from ..path_fix import PathFixRoute
1616from ..key_store import upsert_account_keys_in_store
17- from ..wechat_decrypt import (
18- WeChatDatabaseDecryptor ,
19- build_decrypt_result_message ,
20- decrypt_wechat_databases ,
21- scan_account_databases_from_path ,
22- )
17+ from ..wechat_decrypt import WeChatDatabaseDecryptor , decrypt_wechat_databases , scan_account_databases_from_path
2318
2419logger = get_logger (__name__ )
2520
@@ -81,7 +76,6 @@ async def decrypt_databases(request: DecryptRequest):
8176 "message" : results ["message" ],
8277 "processed_files" : results ["processed_files" ],
8378 "failed_files" : results ["failed_files" ],
84- "failure_details" : results .get ("failure_details" , []),
8579 "account_results" : results .get ("account_results" , {}),
8680 }
8781
@@ -165,7 +159,6 @@ async def generate_progress():
165159 fail_count = 0
166160 processed_files : list [str ] = []
167161 failed_files : list [str ] = []
168- failure_details : list [dict ] = []
169162 account_results : dict = {}
170163 overall_current = 0
171164
@@ -188,7 +181,6 @@ async def generate_progress():
188181 account_success = 0
189182 account_processed : list [str ] = []
190183 account_failed : list [str ] = []
191- account_failure_details : list [dict ] = []
192184
193185 for db_info in dbs :
194186 if await request .is_disconnected ():
@@ -240,20 +232,11 @@ async def generate_progress():
240232 status = "success"
241233 msg = "解密成功"
242234 else :
243- failure_detail = {
244- "account" : account ,
245- "file" : db_path ,
246- "name" : db_name ,
247- "code" : str (decryptor .last_error_code or "" ).strip (),
248- "reason" : str (decryptor .last_error_message or "" ).strip () or "解密失败" ,
249- }
250235 account_failed .append (db_path )
251- account_failure_details .append (failure_detail )
252236 failed_files .append (db_path )
253- failure_details .append (failure_detail )
254237 fail_count += 1
255238 status = "fail"
256- msg = failure_detail [ "reason" ]
239+ msg = "解密失败"
257240
258241 yield _sse (
259242 {
@@ -278,7 +261,6 @@ async def generate_progress():
278261 "output_dir" : str (account_output_dir ),
279262 "processed_files" : account_processed ,
280263 "failed_files" : account_failed ,
281- "failure_details" : account_failure_details ,
282264 }
283265
284266 # Build cache table (keep behavior consistent with the POST endpoint).
@@ -325,15 +307,9 @@ async def generate_progress():
325307 "success_count" : success_count ,
326308 "failure_count" : total_databases - success_count ,
327309 "output_directory" : str (base_output_dir .absolute ()),
328- "message" : build_decrypt_result_message (
329- total_databases = total_databases ,
330- success_count = success_count ,
331- failed_count = total_databases - success_count ,
332- failure_details = failure_details ,
333- ),
310+ "message" : f"解密完成: 成功 { success_count } /{ total_databases } " ,
334311 "processed_files" : processed_files ,
335312 "failed_files" : failed_files ,
336- "failure_details" : failure_details ,
337313 "account_results" : account_results ,
338314 }
339315
0 commit comments