拆分 douyin_detection (1756 → 3 个子模块 + 22 行 shim)

把 douyin/detection/douyin_detection.py 按职责拆成
douyin/detection/detection_pkg/ 子包:

- _common (14)    _ensure_detection_cache 共享缓存初始化
- detail (323)    check_detail_height + check_in_fudai_detail(详情页相关)
- finder (1438)   check_have_fudai_with_ready_screenshot(找福袋图标主入口,最大头)

原文件改为 22 行 re-export shim,4 个公共符号全部保留。
- check_in_fudai_detail 5 处外部引用
- check_have_fudai_with_ready_screenshot 3 处外部引用
- check_detail_height 2 处外部引用
全部不需修改。

子包名 detection_pkg 是为了避免与同目录下的 shim 文件 douyin_detection.py
潜在的命名混淆。

回归:
- 4 个新文件 + shim compileall 通过
- pytest 353 passed / 1 skipped
- 旧 import 路径与新子包路径返回同一函数对象

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
CodexandClaude Opus 4.7 committed 2026-05-21 16:55:24 +08:00
1 parent 19e347e6c1
commit 787c4e8eec
5 files changed
+1817 -1753

No files matched your search

@@ -0,0 +1,23 @@
"""detection_pkg - 福袋检测子包。
原 douyin/detection/douyin_detection.py 拆成 3 个子模块:
- _common _ensure_detection_cache
- detail check_detail_height / check_in_fudai_detail
- finder check_have_fudai_with_ready_screenshot(最大头)
外部 import 路径不变:
``from douyin.detection.douyin_detection import check_in_fudai_detail`` 仍可用
(原文件改成 re-export shim)。
"""
from ._common import _ensure_detection_cache
from .detail import check_detail_height, check_in_fudai_detail
from .finder import check_have_fudai_with_ready_screenshot
__all__ = [
"_ensure_detection_cache",
"check_detail_height",
"check_have_fudai_with_ready_screenshot",
"check_in_fudai_detail",
]
+14
View File
@@ -0,0 +1,14 @@
"""detection_pkg._common - 共享:分析器检测缓存初始化。"""
from __future__ import annotations
from typing import Any
def _ensure_detection_cache(analyser: Any) -> None:
"""Ensure analyser has a simple detection cache structure."""
if not hasattr(analyser, "_detection_cache"):
analyser._detection_cache = {}
if not hasattr(analyser, "_detection_cache_ttl"):
analyser._detection_cache_ttl = 2.0
+323
View File
@@ -0,0 +1,323 @@
"""detection_pkg.detail - 福袋详情页相关检测。
- check_detail_height 识别详情页弹窗中"任务"数量(0/1/2/3)
- check_in_fudai_detail 判断当前是否处于福袋详情页(综合多种特征)
"""
from __future__ import annotations
# pylint: disable=no-member
import os
import time
from typing import Any
from PIL import Image
from ._common import _ensure_detection_cache
def check_detail_height(analyser: Any) -> int:
"""Detect how many tasks are required in the fudai detail popup.
Returns:
0 / 1 / 2 / 3 (number of tasks).
"""
# 使用统一的截图路径配置
try:
from douyin.core import path_config
pic1_path = path_config.get_screenshot_path()
except Exception:
# 回退到旧路径(向后兼容)
from douyin.core import path_config
pic1_path = path_config.get_screenshot_path()
# 记录截图文件的时间戳(如果存在)
screenshot_timestamp = None
try:
if os.path.exists(pic1_path):
screenshot_timestamp = os.path.getmtime(pic1_path)
except Exception:
pass
pic = None
for attempt in range(3):
try:
pic = Image.open(pic1_path)
pic.load() # force load to catch truncated files early
break
except Exception:
if attempt < 2:
try:
analyser.operation.get_screenshot(
analyser.device_id, use_service=False
)
analyser.operation.delay(0.2)
# 重新获取截图后,更新时间戳
try:
if os.path.exists(pic1_path):
screenshot_timestamp = os.path.getmtime(pic1_path)
except Exception:
pass
except Exception:
pass
pic = None
if pic is None:
try:
analyser._log_kv(
"检测",
"读取截图失败,默认不需要任务",
level="WARN",
screenshot_timestamp=screenshot_timestamp,
)
except Exception:
pass
return 0
pic_new = pic.convert("RGBA")
pix = pic_new.load()
width, height = pic_new.size
# X of “参与” button
try:
rx = int(getattr(analyser, "resolution_ratio_x", 1080) or 1080)
except Exception:
rx = 1080
try:
ry = int(getattr(analyser, "resolution_ratio_y", 2400) or 2400)
except Exception:
ry = 2400
x = 536 * rx // 1080
if not (0 <= x < width):
return 0
# (base_y, y_pianyi_offset, task_count)
try:
y_pianyi_val = int(getattr(analyser, "y_pianyi", 0) or 0)
except Exception:
y_pianyi_val = 0
check_points = [
(983, 0, 2),
(983, y_pianyi_val, 2),
(983, -y_pianyi_val, 2),
(883, 0, 3),
(883, y_pianyi_val, 3),
(883, -y_pianyi_val, 3),
(1058, 0, 1),
(1058, y_pianyi_val, 1),
(1058, -y_pianyi_val, 1),
]
def _check_pixel_color(y_coord: int) -> bool:
if not (0 <= y_coord < height):
return False
try:
p = pix[x, y_coord]
if not (isinstance(p, tuple) and len(p) >= 3):
return False
r, g, b = int(p[0]), int(p[1]), int(p[2])
return 28 <= r <= 40 and 32 <= g <= 42 and 76 <= b <= 86
except Exception:
return False
detected_task_count = None
detected_y = None
try:
for base_y, dy, task_count in check_points:
y = base_y * ry // 2400 + dy
if _check_pixel_color(y):
detected_task_count = task_count
detected_y = y
try:
import time
current_time = time.time()
analyser._log_kv(
"检测",
f"识别到福袋任务数量:{task_count}个",
task_count=task_count,
detected_y=detected_y,
screenshot_timestamp=screenshot_timestamp,
current_time=current_time,
time_diff=(
round(current_time - screenshot_timestamp, 3)
if screenshot_timestamp
else None
),
)
except Exception:
pass
break
except Exception:
pass
# 保存调试图片:标注检测区域和检测点
try:
from douyin.handlers import douyin_screenshot_manager
# 计算检测区域(参与按钮附近的区域)
check_region_x1 = max(0, x - 50)
check_region_x2 = min(width, x + 50)
check_region_y1 = max(0, (883 * ry // 2400) - 100) # 3个任务的Y坐标附近
check_region_y2 = min(height, (1058 * ry // 2400) + 100) # 1个任务的Y坐标附近
# 标注检测点
coords_list = []
for base_y, dy, task_count_val in check_points:
check_y = base_y * ry // 2400 + dy
if 0 <= check_y < height:
# 标注检测点(小矩形区域)
coords_list.append(
(
max(0, x - 10),
max(0, check_y - 5),
min(width, x + 10),
min(height, check_y + 5),
)
)
# 保存调试图片
pic_rgb = pic.convert("RGB")
debug_path = douyin_screenshot_manager.save_debug_image(
pic_rgb,
operation_type="detection",
picname="福袋任务数量",
step="task_count_detection",
coords=(check_region_x1, check_region_y1, check_region_x2, check_region_y2),
extra_info={
"task_count": (
detected_task_count if detected_task_count is not None else 0
),
"detected_y": detected_y,
"check_x": x,
"check_points_count": len(check_points),
"region": f"({check_region_x1},{check_region_y1})-({check_region_x2},{check_region_y2})",
},
)
if debug_path:
try:
analyser._log_kv(
"[调试图像]",
"福袋任务数量检测",
path=debug_path,
task_count=(
detected_task_count if detected_task_count is not None else 0
),
)
except Exception:
pass
except Exception:
pass
if detected_task_count is not None:
return detected_task_count
# Optional robot-check path from original implementation
try:
if (
hasattr(analyser, "check_have_robot_analyse")
and analyser.check_have_robot_analyse()
):
analyser.deal_robot_analyse()
except Exception:
pass
try:
import time
current_time = time.time()
analyser._log_kv(
"检测",
"识别福袋任务数量:0个(不需要任务)",
level="INFO",
task_count=0,
screenshot_timestamp=screenshot_timestamp,
current_time=current_time,
time_diff=(
current_time - screenshot_timestamp if screenshot_timestamp else None
),
)
except Exception:
pass
return 0
def check_in_fudai_detail(analyser: Any) -> bool:
"""Detect whether we are currently on the fudai detail page.
使用模板匹配检测,与 detect_fudai_detail_page 保持一致。
"""
_ensure_detection_cache(analyser)
cache_key = "check_in_fudai_detail"
now = time.time()
cached = analyser._detection_cache.get(cache_key)
if cached:
cached_ts, cached_result = cached
ttl = float(getattr(analyser, "_detection_cache_ttl", 2.0) or 2.0)
if (now - cached_ts) < ttl:
return bool(cached_result)
# 使用模板匹配检测,与 detect_fudai_detail_page 保持一致
try:
from douyin.detection import douyin_pixel
from douyin.core import path_config
# 获取截图
pic_path = path_config.get_screenshot_path()
if not os.path.exists(pic_path):
try:
analyser.operation.get_screenshot(analyser.device_id)
except Exception:
analyser._detection_cache[cache_key] = (now, False)
return False
pic_path = path_config.get_screenshot_path()
if not os.path.exists(pic_path):
analyser._detection_cache[cache_key] = (now, False)
return False
pic = Image.open(pic_path)
pic.load()
pic_rgb = pic.convert("RGB")
# 获取分辨率比例和Y偏移
rx = int(getattr(analyser, "resolution_ratio_x", 1080) or 1080)
ry = int(getattr(analyser, "resolution_ratio_y", 2400) or 2400)
y_pianyi = int(getattr(analyser, "y_pianyi", 0) or 0)
# 获取模板匹配阈值(优先使用福袋详情页专用阈值)
template_threshold = float(
getattr(analyser, "fudai_detail_template_threshold", None)
or getattr(analyser, "fudai_template_match_threshold", 0.7)
or 0.7
)
if template_threshold < 0.0:
template_threshold = 0.0
if template_threshold > 1.0:
template_threshold = 1.0
# 使用任务数量检测
result = douyin_pixel.detect_fudai_detail_page(
pic_rgb,
rx,
ry,
y_pianyi,
template_threshold,
return_info=False, # 不需要详细信息
analyser=analyser,
)
is_in_detail = bool(result)
analyser._detection_cache[cache_key] = (now, is_in_detail)
return is_in_detail
except Exception:
analyser._detection_cache[cache_key] = (now, False)
return False
# ========== 以下为旧的像素检测代码,已暂时禁用 ==========
# 像素检测代码已删除,使用模板匹配替代
# 如需恢复像素检测,请参考 git 历史记录
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff