taotoolkit 2.0.2__tar.gz → 2.0.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taotoolkit
-Version: 2.0.2
+Version: 2.0.3
 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.3; extra == "uiautomator"
 
 # TAO - Toolkit
 

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "taotoolkit"
-version = "2.0.2"
+version = "2.0.3"
 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.3",
 ]

{taotoolkit-2.0.2 → taotoolkit-2.0.3}/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.3"
 
 __all__ = [
     "debugCtrl",

{taotoolkit-2.0.2 → taotoolkit-2.0.3}/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.3}/taotoolkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taotoolkit
-Version: 2.0.2
+Version: 2.0.3
 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.3; extra == "uiautomator"
 
 # TAO - Toolkit
 

{taotoolkit-2.0.2 → taotoolkit-2.0.3}/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.3