P2 §5.3: 23 处 importlib.import_module → 静态 from import
把剩余 5 个文件里所有动态导入 douyin_screenshot_manager 的 importlib 调用 替换为顶部静态 from import 模式: - douyin/detection/douyin_pixel.py 7 处 - douyin/detection/douyin_detection.py 8 处 - douyin/fudai/douyin_fudai_finder.py 4 处 - douyin/fudai/core/fudai_attend.py 2 处 - gui/gui_app.py 2 处 douyin_screenshot_manager 只引用 douyin.core.path_config,与上述 5 个文件 无循环依赖。bin/run_cli.py 的剩余 1 处 importlib 是有意为之 (绕过 package __init__ 遮蔽),保留。 收益: - 可读性 + IDE 跳转/类型提示 - 每次调用省去 ~100µs 的 import_module 开销(detection 模块在热路径上调用密集) - 死代码减少 ~92 行(5 个文件合计 -115 / +23) 回归:140 .py 编译通过;importlib 残留只剩 bin/run_cli 故意 1 处; 5 个模块导入 + fudai_analyse + should_skip_fudai_by_config 业务链路正常; test_filter_logging / check_web_gui_config_sync 通过。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
1 parent
7001919642
commit
0d01dabb69
5 files changed
+23
-115
No files matched your search
@@ -171,11 +171,7 @@ def check_detail_height(analyser: Any) -> int:
|
||||
|
||||
# 保存调试图片:标注检测区域和检测点
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
|
||||
# 计算检测区域(参与按钮附近的区域)
|
||||
check_region_x1 = max(0, x - 50)
|
||||
@@ -533,11 +529,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
|
||||
# 双截图记录:保存实时操作截图(像素检测区域)
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
|
||||
douyin_screenshot_manager.save_latest_attempt(
|
||||
roi, operation_type="pixel_detect"
|
||||
@@ -604,11 +596,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
|
||||
# 双截图记录:保存成功识别存档截图
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
|
||||
douyin_screenshot_manager.save_last_success(
|
||||
roi, operation_type="pixel_detect"
|
||||
@@ -774,11 +762,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
|
||||
# 双截图记录:保存成功识别存档截图
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
|
||||
detect_roi = pic_new.crop(
|
||||
(
|
||||
@@ -956,11 +940,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
|
||||
# 双截图记录:保存实时操作截图(搜索区域)
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
from PIL import Image as PILImage
|
||||
|
||||
search_roi_pil = PILImage.fromarray(
|
||||
@@ -994,11 +974,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
if max_val >= template_threshold:
|
||||
# 双截图记录:保存成功识别存档截图
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
from PIL import Image as PILImage
|
||||
|
||||
search_roi_pil = PILImage.fromarray(
|
||||
@@ -1429,11 +1405,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
|
||||
# 双截图记录:保存实时操作截图(搜索区域)
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
from PIL import Image as PILImage
|
||||
|
||||
search_roi_pil = PILImage.fromarray(
|
||||
@@ -1493,11 +1465,7 @@ def check_have_fudai_with_ready_screenshot(
|
||||
if max_val >= template_threshold:
|
||||
# 双截图记录:保存成功识别存档截图
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
from PIL import Image as PILImage
|
||||
|
||||
search_roi_pil = PILImage.fromarray(
|
||||
|
||||
@@ -325,11 +325,7 @@ def detect_lucky_draw_result_popup(
|
||||
# 双截图记录:保存实时操作截图(像素检测区域)
|
||||
detect_roi = None
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
|
||||
detect_roi = pic_rgb.crop((x1, y1, x2, y2))
|
||||
douyin_screenshot_manager.save_latest_attempt(
|
||||
@@ -387,11 +383,7 @@ def detect_lucky_draw_result_popup(
|
||||
|
||||
# 保存调试图像(检测结果)- 使用全屏截图,用框框选出识别区域
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
|
||||
if result:
|
||||
# 检测成功
|
||||
@@ -486,11 +478,7 @@ def detect_attend_button_red_area(
|
||||
|
||||
# 保存调试图像(检测前)- 使用全屏截图,用框框选出识别区域
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
|
||||
debug_path = douyin_screenshot_manager.save_debug_image(
|
||||
pic_rgb, # 使用全屏截图
|
||||
@@ -564,11 +552,7 @@ def detect_attend_button_red_area(
|
||||
# 保存调试图像(检测结果)- 使用全屏截图,用框框选出识别区域
|
||||
# 无论成功失败都保存debug截图
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
|
||||
debug_path = douyin_screenshot_manager.save_debug_image(
|
||||
pic_rgb, # 使用全屏截图
|
||||
@@ -651,11 +635,7 @@ def detect_fansclub_join_red_area(
|
||||
|
||||
# 保存调试图像(检测前)- 使用全屏截图,用框框选出识别区域
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
|
||||
debug_path = douyin_screenshot_manager.save_debug_image(
|
||||
pic_rgb, # 使用全屏截图
|
||||
@@ -723,11 +703,7 @@ def detect_fansclub_join_red_area(
|
||||
|
||||
# 保存调试图像(检测结果)- 使用全屏截图,用框框选出识别区域
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
|
||||
# 无论成功失败都保存debug截图
|
||||
debug_path = douyin_screenshot_manager.save_debug_image(
|
||||
@@ -880,11 +856,7 @@ def detect_live_room_icons_by_pixel(pic_rgb: Image.Image) -> tuple[bool, float]:
|
||||
|
||||
# 保存调试图像(检测结果)
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
|
||||
debug_path = douyin_screenshot_manager.save_debug_image(
|
||||
pic_rgb, # 使用全屏截图
|
||||
|
||||
@@ -525,11 +525,7 @@ def attend_choujiang(analyser) -> bool:
|
||||
|
||||
# 保存debug截图:标注OCR识别区域(参与按钮区域)
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
|
||||
pic_path = path_config.get_screenshot_path()
|
||||
if os.path.exists(pic_path):
|
||||
@@ -684,11 +680,7 @@ def attend_choujiang(analyser) -> bool:
|
||||
|
||||
# 保存debug截图:标注OCR识别区域(加入粉丝团按钮区域)
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
|
||||
pic_path = path_config.get_screenshot_path()
|
||||
if os.path.exists(pic_path):
|
||||
|
||||
@@ -762,11 +762,7 @@ class FudaiDetector:
|
||||
|
||||
# 保存模板匹配的调试图像(无论成功与否)- 使用完整截图
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
# Image 已在文件顶部导入
|
||||
|
||||
# 使用完整截图而不是搜索区域ROI
|
||||
@@ -1270,11 +1266,7 @@ class FudaiDetailVerifier:
|
||||
|
||||
# 保存完整截图并标注OCR区域
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
|
||||
pic_path = path_config.get_screenshot_path()
|
||||
if os.path.exists(pic_path):
|
||||
@@ -1569,11 +1561,7 @@ class FudaiFinder:
|
||||
|
||||
# 保存完整截图用于调试(检测前)
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
|
||||
pic_rgb_full = pic.convert("RGB")
|
||||
|
||||
@@ -1640,11 +1628,7 @@ class FudaiFinder:
|
||||
consecutive_failures = 0
|
||||
# 保存完整截图(检测成功)
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
|
||||
pic_rgb_full = pic.convert("RGB")
|
||||
|
||||
|
||||
+2
-10
@@ -1672,11 +1672,7 @@ def main():
|
||||
|
||||
def on_reset_async_counters():
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
douyin_screenshot_manager.reset_async_save_counters()
|
||||
debug_async_success_var.set(0)
|
||||
debug_async_failure_var.set(0)
|
||||
@@ -1690,11 +1686,7 @@ def main():
|
||||
# 周期性更新计数器(2秒)
|
||||
def _update_async_counters():
|
||||
try:
|
||||
import importlib
|
||||
|
||||
douyin_screenshot_manager = importlib.import_module(
|
||||
"douyin.handlers.douyin_screenshot_manager"
|
||||
)
|
||||
from douyin.handlers import douyin_screenshot_manager
|
||||
s, f = douyin_screenshot_manager.get_async_save_counters()
|
||||
debug_async_success_var.set(s)
|
||||
debug_async_failure_var.set(f)
|
||||
|
||||
Reference in new issue
Block a user