taotoolkit 2.0.2__tar.gz → 2.0.4__tar.gz

{taotoolkit-2.0.2 → taotoolkit-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taotoolkit
-Version: 2.0.2
+Version: 2.0.4
 Summary: Tao ToolKit
 Author-email: taotaoli <taotaoli@asrmicro.com>
 License-Expression: MIT
@@ -19,7 +19,7 @@ Requires-Dist: beautifulsoup4>=4.10.0
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: pywinpty>=3.0.5; platform_system == "Windows"
 Provides-Extra: uiautomator
-Requires-Dist: uiautomator2>=2.0.2; extra == "uiautomator"
+Requires-Dist: uiautomator2>=2.0.4; extra == "uiautomator"
 
 # TAO - Toolkit
 

{taotoolkit-2.0.2 → taotoolkit-2.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "taotoolkit"
-version = "2.0.2"
+version = "2.0.4"
 description = "Tao ToolKit"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -29,5 +29,5 @@ dependencies = [
 
 [project.optional-dependencies]
 uiautomator = [
-  "uiautomator2>=2.0.2",
+  "uiautomator2>=2.0.4",
 ]

{taotoolkit-2.0.2 → taotoolkit-2.0.4}/taotoolkit/__init__.py

@@ -43,7 +43,7 @@ from .tao_camDvt import camDvtMain as camDvtMain, printHelp as camDvtHelp, CamDv
 
 from .asrVrf import Vrf
 
-__version__ = "2.0.2"
+__version__ = "2.0.4"
 
 __all__ = [
     "debugCtrl",

{taotoolkit-2.0.2 → taotoolkit-2.0.4}/taotoolkit/tao_common.py

@@ -10,7 +10,7 @@ import time
 import atexit
 from functools import wraps
 from datetime import datetime
-from typing import Callable, Dict, List, Optional, Any
+from typing import Callable, Dict, List, Optional, Any, Union, Iterable
 from colorama import Back, Fore, Style, init
 
 try:
@@ -217,20 +217,31 @@ def fileExist(path: str) -> bool:
     return os.path.exists(path)
 
 
-def findFilesBySuffixKeyword(path: str, suffix: str, keyword: str) -> List[str]:
+def _normalizeSuffixes(suffix: Union[str, Iterable[str]]) -> tuple:
+    """将单个后缀或后缀集合统一为 tuple, 供 str.endswith 使用。"""
+    if isinstance(suffix, str):
+        return (suffix,)
+    return tuple(suffix)
+
+
+def findFilesBySuffixKeyword(path: str, suffix: Union[str, Iterable[str]], keyword: str) -> List[str]:
+    """递归查找以指定后缀结尾(支持1个及以上后缀)且文件名包含关键字的文件。"""
+    suffixes = _normalizeSuffixes(suffix)
     result = []
     for root, _dirs, files in os.walk(path):
         for f in files:
-            if f.endswith(suffix) and keyword in f:
+            if f.endswith(suffixes) and keyword in f:
                 result.append(os.path.join(root, f))
     return result
 
 
-def findFilesWithSuffix(path: str, suffix: str) -> List[str]:
+def findFilesWithSuffix(path: str, suffix: Union[str, Iterable[str]]) -> List[str]:
+    """递归查找以指定后缀结尾的文件, 支持1个及以上后缀。"""
+    suffixes = _normalizeSuffixes(suffix)
     result = []
     for root, _dirs, files in os.walk(path):
         for f in files:
-            if f.endswith(suffix):
+            if f.endswith(suffixes):
                 result.append(os.path.join(root, f))
     return result
 

{taotoolkit-2.0.2 → taotoolkit-2.0.4}/taotoolkit/tao_device.py

@@ -47,6 +47,8 @@ from .tao_common import (
 
 CACHE_FILE = os.path.join(os.path.dirname(__file__), ".dev_cache.json")
 CACHE_TTL = 3600
+# 匹配 "SERIAL\tdevice ..." 行；unauthorized/offline 不算可用设备
+DEVICE_LINE_RE = re.compile(r"^\S+\s+device\b", re.MULTILINE)
 
 
 def _load_cache():
@@ -145,6 +147,7 @@ class DevOp:
         logd(f"serial = {serial} needroot ={needRoot}")
 
         self.adb = adb_path
+        self.serial = serial
         self._displays: Optional[List[DisplayInfo]] = None
         self.curScreenW = 0
         self.curScreenH = 0
@@ -159,8 +162,8 @@ class DevOp:
         self.soc = None
         self.chipId = None
 
-        # 检查设备是否连接
-        out, _ = pCmd("adb devices -l", waitDone=True, timeOut=5, logLevel="debug")
+        # 检查设备是否连接（adb server 冷启动较慢，首次易超时）
+        out = self._probeDevices()
         cache = _load_cache()
 
         # 判断缓存是否命中
@@ -243,6 +246,30 @@ class DevOp:
         except FileNotFoundError:
             return "", "adb not found in PATH"
 
+    def _probeDevices(self, timeout: int = 10) -> str:
+        """探测已连接设备。adb server 冷启动时，首次调用可能超时，
+        也可能 server 已返回但 USB 设备尚未枚举完成（只返回表头），
+        因此这里显式等待设备出现，避免第一次执行直接失败。"""
+        out, err = self._adb("devices", "-l", timeout=timeout)
+        if DEVICE_LINE_RE.search(out) or "unauthorized" in out or "offline" in out:
+            return out
+
+        # 冷启动：先确保 server 就绪，再等待设备枚举
+        logw("未发现设备，启动 adb server 并等待设备枚举")
+        try:
+            subprocess.run([self.adb, "start-server"], capture_output=True, timeout=30)
+        except (subprocess.TimeoutExpired, OSError) as e:
+            logw(f"adb start-server 失败: {e}")
+
+        deadline = time.monotonic() + timeout
+        while time.monotonic() < deadline:
+            time.sleep(0.5)
+            out, err = self._adb("devices", "-l", timeout=5)
+            if DEVICE_LINE_RE.search(out) or "unauthorized" in out or "offline" in out:
+                return out
+        loge(f"adb devices -l 未发现可用设备: {err}")
+        return out
+
     def _adb_shell(self, shell_cmd: str, timeout: int = 10) -> Tuple[str, str]:
         return self._adb("shell", shell_cmd, timeout=timeout)
 
@@ -273,7 +300,7 @@ class DevOp:
 
     def getConnectedDevices(self):
         try:
-            out, error = pCmd("adb devices -l", showCmd=True, waitDone=True, timeOut=6, logLevel="debug")
+            out, error = self._adb("devices", "-l", timeout=5)
             if "offline" in out or "unauthorized" in out:
                 tmp = out.split("\n")[1].split(" ")[0]
                 eExit(f"{tmp} devices offline or unauthorized")

{taotoolkit-2.0.2 → taotoolkit-2.0.4}/taotoolkit/tao_tuning.py

@@ -875,7 +875,7 @@ class asrCamOp(DevOp):
                         )
                     else:
                         out, _ = rCmd(
-                            f"adb -s {self.serial} push {vrf} vendor/etc/camera/{vrf}",
+                            f"adb -s {self.serial} push {vrf} vendor/etc/camera",
                             showCmd=True,
                             showRet=True,
                             logLevel="info",

{taotoolkit-2.0.2 → taotoolkit-2.0.4}/taotoolkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taotoolkit
-Version: 2.0.2
+Version: 2.0.4
 Summary: Tao ToolKit
 Author-email: taotaoli <taotaoli@asrmicro.com>
 License-Expression: MIT
@@ -19,7 +19,7 @@ Requires-Dist: beautifulsoup4>=4.10.0
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: pywinpty>=3.0.5; platform_system == "Windows"
 Provides-Extra: uiautomator
-Requires-Dist: uiautomator2>=2.0.2; extra == "uiautomator"
+Requires-Dist: uiautomator2>=2.0.4; extra == "uiautomator"
 
 # TAO - Toolkit
 

{taotoolkit-2.0.2 → taotoolkit-2.0.4}/taotoolkit.egg-info/requires.txt

@@ -14,4 +14,4 @@ pyyaml>=6.0.3
 pywinpty>=3.0.5
 
 [uiautomator]
-uiautomator2>=2.0.2
+uiautomator2>=2.0.4