From 1fdec7a54869f63f8dd381bcaf3944b1c2d97241 Mon Sep 17 00:00:00 2001 From: Codex Date: Wed, 20 May 2026 20:49:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E9=A1=B9=E7=9B=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../optimization/ADB_EXECOUT_OPTIMIZATION.md | 0 .../optimization/OCR_PERFORMANCE_OPTIMIZATION.md | 0 .../optimization/SCREENSHOT_PERFORMANCE_DIAGNOSIS.md | 0 .../optimization/SCREENSHOT_VERIFICATION_GUIDE.md | 0 .../STREAMING_SCREENSHOT_COMPLETELY_DISABLED.md | 0 .../optimization/STREAMING_SCREENSHOT_DISABLED.md | 0 .../optimization/optimize_file_replace.md | 0 .../reports/config.json.bak_20260104_161454 | 0 .../reports/git_lsremote_trace.txt | 0 .../reports/log_filter_result.txt | 0 .../reports/time_analysis_result.txt | 0 run_test.py => tests/run_test.py | 10 ++++++++-- test_delays.py => tests/test_delays.py | 9 +++++++-- test_filter_logging.py => tests/test_filter_logging.py | 3 ++- test_ocr_comparison.py => tests/test_ocr_comparison.py | 6 ++++-- test_webgui.py => tests/test_webgui.py | 2 +- .../validation/validate_fudai_mapping_recording.py | 5 +++-- .../validation/validate_reservation_lock_protection.py | 5 +++-- check_action_logger.py => tools/check_action_logger.py | 8 +++++++- tmp_threshold_check.py => tools/tmp_threshold_check.py | 0 20 files changed, 35 insertions(+), 13 deletions(-) rename ADB_EXECOUT_OPTIMIZATION.md => docs/optimization/ADB_EXECOUT_OPTIMIZATION.md (100%) rename OCR_PERFORMANCE_OPTIMIZATION.md => docs/optimization/OCR_PERFORMANCE_OPTIMIZATION.md (100%) rename SCREENSHOT_PERFORMANCE_DIAGNOSIS.md => docs/optimization/SCREENSHOT_PERFORMANCE_DIAGNOSIS.md (100%) rename SCREENSHOT_VERIFICATION_GUIDE.md => docs/optimization/SCREENSHOT_VERIFICATION_GUIDE.md (100%) rename STREAMING_SCREENSHOT_COMPLETELY_DISABLED.md => docs/optimization/STREAMING_SCREENSHOT_COMPLETELY_DISABLED.md (100%) rename STREAMING_SCREENSHOT_DISABLED.md => docs/optimization/STREAMING_SCREENSHOT_DISABLED.md (100%) rename optimize_file_replace.md => docs/optimization/optimize_file_replace.md (100%) rename config.json.bak_20260104_161454 => docs/reports/config.json.bak_20260104_161454 (100%) rename git_lsremote_trace.txt => docs/reports/git_lsremote_trace.txt (100%) rename log_filter_result.txt => docs/reports/log_filter_result.txt (100%) rename time_analysis_result.txt => docs/reports/time_analysis_result.txt (100%) rename run_test.py => tests/run_test.py (81%) rename test_delays.py => tests/test_delays.py (86%) rename test_filter_logging.py => tests/test_filter_logging.py (90%) rename test_ocr_comparison.py => tests/test_ocr_comparison.py (98%) rename test_webgui.py => tests/test_webgui.py (92%) rename validate_fudai_mapping_recording.py => tests/validation/validate_fudai_mapping_recording.py (87%) rename validate_reservation_lock_protection.py => tests/validation/validate_reservation_lock_protection.py (90%) rename check_action_logger.py => tools/check_action_logger.py (93%) rename tmp_threshold_check.py => tools/tmp_threshold_check.py (100%) diff --git a/ADB_EXECOUT_OPTIMIZATION.md b/docs/optimization/ADB_EXECOUT_OPTIMIZATION.md similarity index 100% rename from ADB_EXECOUT_OPTIMIZATION.md rename to docs/optimization/ADB_EXECOUT_OPTIMIZATION.md diff --git a/OCR_PERFORMANCE_OPTIMIZATION.md b/docs/optimization/OCR_PERFORMANCE_OPTIMIZATION.md similarity index 100% rename from OCR_PERFORMANCE_OPTIMIZATION.md rename to docs/optimization/OCR_PERFORMANCE_OPTIMIZATION.md diff --git a/SCREENSHOT_PERFORMANCE_DIAGNOSIS.md b/docs/optimization/SCREENSHOT_PERFORMANCE_DIAGNOSIS.md similarity index 100% rename from SCREENSHOT_PERFORMANCE_DIAGNOSIS.md rename to docs/optimization/SCREENSHOT_PERFORMANCE_DIAGNOSIS.md diff --git a/SCREENSHOT_VERIFICATION_GUIDE.md b/docs/optimization/SCREENSHOT_VERIFICATION_GUIDE.md similarity index 100% rename from SCREENSHOT_VERIFICATION_GUIDE.md rename to docs/optimization/SCREENSHOT_VERIFICATION_GUIDE.md diff --git a/STREAMING_SCREENSHOT_COMPLETELY_DISABLED.md b/docs/optimization/STREAMING_SCREENSHOT_COMPLETELY_DISABLED.md similarity index 100% rename from STREAMING_SCREENSHOT_COMPLETELY_DISABLED.md rename to docs/optimization/STREAMING_SCREENSHOT_COMPLETELY_DISABLED.md diff --git a/STREAMING_SCREENSHOT_DISABLED.md b/docs/optimization/STREAMING_SCREENSHOT_DISABLED.md similarity index 100% rename from STREAMING_SCREENSHOT_DISABLED.md rename to docs/optimization/STREAMING_SCREENSHOT_DISABLED.md diff --git a/optimize_file_replace.md b/docs/optimization/optimize_file_replace.md similarity index 100% rename from optimize_file_replace.md rename to docs/optimization/optimize_file_replace.md diff --git a/config.json.bak_20260104_161454 b/docs/reports/config.json.bak_20260104_161454 similarity index 100% rename from config.json.bak_20260104_161454 rename to docs/reports/config.json.bak_20260104_161454 diff --git a/git_lsremote_trace.txt b/docs/reports/git_lsremote_trace.txt similarity index 100% rename from git_lsremote_trace.txt rename to docs/reports/git_lsremote_trace.txt diff --git a/log_filter_result.txt b/docs/reports/log_filter_result.txt similarity index 100% rename from log_filter_result.txt rename to docs/reports/log_filter_result.txt diff --git a/time_analysis_result.txt b/docs/reports/time_analysis_result.txt similarity index 100% rename from time_analysis_result.txt rename to docs/reports/time_analysis_result.txt diff --git a/run_test.py b/tests/run_test.py similarity index 81% rename from run_test.py rename to tests/run_test.py index 8123b96..d9b50ee 100644 --- a/run_test.py +++ b/tests/run_test.py @@ -5,7 +5,8 @@ import sys import subprocess # 查找目标文件 -target_dir = "pic/debug_captures/2025-12-31" +PROJECT_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +target_dir = os.path.join(PROJECT_ROOT, "pic", "debug_captures", "2025-12-31") if os.path.exists(target_dir): files = os.listdir(target_dir) # 查找包含关键字的文件 @@ -24,7 +25,12 @@ if os.path.exists(target_dir): print("\n开始运行测试...\n") # 运行测试脚本 - cmd = [sys.executable, "-u", "test_real_parallel_ocr.py", full_path] + cmd = [ + sys.executable, + "-u", + os.path.join(PROJECT_ROOT, "deleted_tests_backup", "test_real_parallel_ocr.py"), + full_path, + ] env = os.environ.copy() env['PYTHONIOENCODING'] = 'utf-8' env['PYTHONUNBUFFERED'] = '1' diff --git a/test_delays.py b/tests/test_delays.py similarity index 86% rename from test_delays.py rename to tests/test_delays.py index cfd3c3a..b2cf1c7 100644 --- a/test_delays.py +++ b/tests/test_delays.py @@ -6,7 +6,8 @@ import sys import os -sys.path.insert(0, os.path.dirname(__file__)) +PROJECT_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +sys.path.insert(0, PROJECT_ROOT) def test_delays(): @@ -14,7 +15,11 @@ def test_delays(): print("=== 测试延迟设置 ===") # 检查代码中是否包含正确的延迟调用 - with open("douyin/other/douyin_yanghao.py", "r", encoding="utf-8") as f: + with open( + os.path.join(PROJECT_ROOT, "douyin", "other", "douyin_yanghao.py"), + "r", + encoding="utf-8", + ) as f: content = f.read() # 检查点击爱心前的延迟 diff --git a/test_filter_logging.py b/tests/test_filter_logging.py similarity index 90% rename from test_filter_logging.py rename to tests/test_filter_logging.py index a09f666..f7031e9 100644 --- a/test_filter_logging.py +++ b/tests/test_filter_logging.py @@ -5,7 +5,8 @@ import os import time # 添加项目根目录到路径 -sys.path.insert(0, os.path.dirname(__file__)) +PROJECT_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +sys.path.insert(0, PROJECT_ROOT) from douyin.fudai.douyin_fudai_core import should_skip_fudai_by_config diff --git a/test_ocr_comparison.py b/tests/test_ocr_comparison.py similarity index 98% rename from test_ocr_comparison.py rename to tests/test_ocr_comparison.py index 03d33ac..4f7643f 100644 --- a/test_ocr_comparison.py +++ b/tests/test_ocr_comparison.py @@ -12,6 +12,8 @@ import psutil import gc from pathlib import Path +PROJECT_ROOT = Path(__file__).resolve().parents[1] + def get_memory_usage(): """获取当前内存使用情况""" @@ -49,7 +51,7 @@ def test_easyocr_performance(): print(f" 内存增加: {memory_after - memory_before:.2f}MB") # 查找测试图片 - pic_dir = Path("pic") + pic_dir = PROJECT_ROOT / "pic" test_images = list(pic_dir.glob("*.png"))[:2] # 最多2张图片 if not test_images: @@ -115,7 +117,7 @@ def test_paddleocr_performance(): print(f" 内存增加: {memory_after - memory_before:.2f}MB") # 查找测试图片 - pic_dir = Path("pic") + pic_dir = PROJECT_ROOT / "pic" test_images = list(pic_dir.glob("*.png"))[:2] # 最多2张图片 if not test_images: diff --git a/test_webgui.py b/tests/test_webgui.py similarity index 92% rename from test_webgui.py rename to tests/test_webgui.py index 7b61e5e..df15ce4 100644 --- a/test_webgui.py +++ b/tests/test_webgui.py @@ -5,7 +5,7 @@ import subprocess import threading # Add project root to path -project_root = os.path.dirname(os.path.abspath(__file__)) +project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) if project_root not in sys.path: sys.path.insert(0, project_root) diff --git a/validate_fudai_mapping_recording.py b/tests/validation/validate_fudai_mapping_recording.py similarity index 87% rename from validate_fudai_mapping_recording.py rename to tests/validation/validate_fudai_mapping_recording.py index 941fae2..9807783 100644 --- a/validate_fudai_mapping_recording.py +++ b/tests/validation/validate_fudai_mapping_recording.py @@ -6,7 +6,8 @@ import sys import os -sys.path.insert(0, os.path.dirname(__file__)) +PROJECT_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) +sys.path.insert(0, PROJECT_ROOT) def validate_fudai_mapping_recording(): @@ -22,7 +23,7 @@ def validate_fudai_mapping_recording(): ] # 读取文件内容 - file_path = "douyin/fudai/douyin_fudai_core.py" + file_path = os.path.join(PROJECT_ROOT, "douyin", "fudai", "douyin_fudai_core.py") try: with open(file_path, "r", encoding="utf-8") as f: content = f.read() diff --git a/validate_reservation_lock_protection.py b/tests/validation/validate_reservation_lock_protection.py similarity index 90% rename from validate_reservation_lock_protection.py rename to tests/validation/validate_reservation_lock_protection.py index 32d9ae4..e4447a8 100644 --- a/validate_reservation_lock_protection.py +++ b/tests/validation/validate_reservation_lock_protection.py @@ -6,7 +6,8 @@ import sys import os -sys.path.insert(0, os.path.dirname(__file__)) +PROJECT_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) +sys.path.insert(0, PROJECT_ROOT) def validate_reservation_lock_protection(): @@ -23,7 +24,7 @@ def validate_reservation_lock_protection(): ] # 读取文件内容 - file_path = "douyin/core/douyin_fudai.py" + file_path = os.path.join(PROJECT_ROOT, "douyin", "core", "douyin_fudai.py") try: with open(file_path, "r", encoding="utf-8") as f: content = f.read() diff --git a/check_action_logger.py b/tools/check_action_logger.py similarity index 93% rename from check_action_logger.py rename to tools/check_action_logger.py index 45ff467..ea567f4 100644 --- a/check_action_logger.py +++ b/tools/check_action_logger.py @@ -2,11 +2,17 @@ """项目自检脚本:检查 action_logger 初始化与 analyser._log_kv 绑定。 用法: 在与项目相同的 Python 环境中运行: - python check_action_logger.py + python tools/check_action_logger.py """ import logging import time import traceback +from pathlib import Path + +import sys + +PROJECT_ROOT = Path(__file__).resolve().parents[1] +sys.path.insert(0, str(PROJECT_ROOT)) from douyin.logging import action_logger, douyin_logging_wrapper from douyin.core.douyin_fudai import fudai_analyse diff --git a/tmp_threshold_check.py b/tools/tmp_threshold_check.py similarity index 100% rename from tmp_threshold_check.py rename to tools/tmp_threshold_check.py