Files
douyi_guaji_main/gui/web_gui_pkg/adb_compat.py
T
CodexandClaude Opus 4.7 a6bbdcc400 拆分 web_gui (2251 → 5 子模块 + 2148 行原文件保留 ProcRunner/Handler/main)
把 gui/web_gui.py 中 11 个独立 helper 拆出到 gui/web_gui_pkg/ 子包,
ProcRunner 巨型类(1514 行 / 25 实例方法 / 390 处 self)+ Handler 类
(588 行)+ main 留在原文件。

新建子包:
- logger (29)         _wg_log + module logger
- ansi (17)           strip_ansi_escape_codes + _ANSI_ESCAPE_RE
- adb_compat (44)     5 个 thin wrapper(forward 到 gui.gui_core_pkg)
- nested (18)         get_nested_value(点号路径配置读取)
- stats_helpers (71)  _parse_countdown_seconds / _bucket / _inc_map(ProcRunner 3 个 @staticmethod)

策略:8 个顶层 helper 直接搬子包;ProcRunner 内 3 个 @staticmethod 也搬,
类内改成 1 行 @staticmethod forwarding 保持 ProcRunner._parse_countdown_seconds
等调用兼容。原文件 import gui.web_gui_pkg 暴露 11 个公共符号。

外部 import 路径全部不变:
- find_adb_executable / read_config / list_adb_devices 等共 70+ 处外部引用
  全部不需修改(CONFIG_PATH 17 处 / read_config 17 处 / find_adb_executable
  18 处 / list_adb_devices 21 处 / write_config 10 处 / 其他 1-7 处)

回归:
- 6 个新文件 + 改写后 web_gui.py compileall 通过
- pytest 353 passed / 1 skipped
- _wg_log / strip_ansi_escape_codes / get_nested_value 调用结果正确
- ProcRunner._parse_countdown_seconds('1:30') = 90 (薄壳 forwarding OK)
- ProcRunner._bucket(15, [0,10,50,100]) = '10-50'
- ProcRunner._inc_map(m, 'k', 5) -> {'k': 5}
- ProcRunner() 实例化 OK

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-21 18:57:52 +08:00

45 lines
1.2 KiB
Python
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
"""web_gui_pkg.adb_compat - ADB / 配置兼容 wrapper。
5 个 thin wrapper 转发到 ``gui.gui_core_pkg``:
- find_adb_executable / list_adb_devices / resolve_adb_device
- read_config / write_config
历史外部代码 ``from gui.web_gui import find_adb_executable`` 等仍可用。
"""
from __future__ import annotations
def find_adb_executable() -> str:
"""[兼容] 已迁移到 gui.gui_core。"""
from gui.gui_core import find_adb_executable as _impl
return _impl()
def list_adb_devices(adb_exe: str) -> list[str]:
"""[兼容] 已迁移到 gui.gui_core。"""
from gui.gui_core import list_adb_devices as _impl
return _impl(adb_exe)
def resolve_adb_device(adb_exe: str, requested_device_id: str = "") -> str:
"""[兼容] 已迁移到 gui.gui_core。"""
from gui.gui_core import resolve_adb_device as _impl
return _impl(adb_exe, requested_device_id)
def read_config() -> dict:
"""[兼容] 已迁移到 gui.gui_core。"""
from gui.gui_core import read_config as _impl
return _impl()
def write_config(cfg: dict) -> None:
"""[兼容] 已迁移到 gui.gui_core。"""
from gui.gui_core import write_config as _impl
return _impl(cfg)