nfcscript 0.0.15__tar.gz → 0.0.16__tar.gz

{nfcscript-0.0.15 → nfcscript-0.0.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nfcscript
-Version: 0.0.15
+Version: 0.0.16
 Summary: A plugin-based core engine for DSL-style NFC testing automation.
 Author: crthu
 Requires-Python: >=3.14
@@ -36,13 +36,13 @@ nfcscript test_card.py -p COM21
 nfcscript test_card.py -r acr122u
 
 # 开启追踪层
-nfcscript test_card.py --trace=protocol,debug
+nfcscript test_card.py --trace-layer=protocol,debug
 
 # 设置日志级别
-nfcscript test_card.py --level=trace
+nfcscript test_card.py --trace-level=driver
 
 # 组合使用
-nfcscript test_card.py -p COM21 -r pn532 --trace=protocol,debug --level=trace
+nfcscript test_card.py -p COM21 -r pn532 --trace-layer=protocol,debug --trace-level=driver
 ```
 
 ### nfc-cli - 交互式命令行
@@ -120,8 +120,8 @@ from nfc import *
 connect()
 
 # 开启追踪
-trace.driver = True
-trace.protocol = True
+trace.filter.driver = True
+trace.filter.protocol = True
 
 # 寻卡（自动切换协议解析器）
 card_info = active()
@@ -195,11 +195,11 @@ with session() as reader:
 
 | 属性 | 说明 |
 |------|------|
-| `trace.driver = True` | 启用 driver 层 |
-| `trace.protocol = True` | 启用 protocol 层 |
-| `trace.debug = False` | 禁用 debug 层 |
-| `trace.level = "warning"` | 设置最低日志级别 |
-| `trace.level = 30` | 或用数字 |
+| `trace.filter.driver = True` | 启用 driver 层 |
+| `trace.filter.protocol = True` | 启用 protocol 层 |
+| `trace.filter.debug = False` | 禁用 debug 层 |
+| `trace.filter.level = "warning"` | 设置最低日志级别 |
+| `trace.filter.level = 30` | 或用数字 |
 
 ```python
 # 简洁写法
@@ -207,9 +207,9 @@ trace.app("UID: AA BB CC DD")
 trace.debug("[auth] Rt: 80 81")
 
 # 属性控制
-trace.driver = True
-trace.protocol = True
-trace.level = "debug"
+trace.filter.driver = True
+trace.filter.protocol = True
+trace.filter.level = "debug"
 ```
 
 ### assertions.py
@@ -257,7 +257,7 @@ trace.level = "debug"
 |------|------|--------|
 | `NFC_PORT` | 串口号 | - |
 | `NFC_READER` | 读卡器类型 | - |
-| `NFC_TRACE` | 启用的层 (逗号分隔) | - |
+| `NFC_TRACE_LAYER` | 启用的层 (逗号分隔) | - |
 | `NFC_TRACE_LEVEL` | 最低日志级别 | `warning` |
 | `NFC_CARD_PATH` | 外部卡片模块搜索路径 (分号分隔) | - |
 
@@ -273,8 +273,8 @@ trace.level = "debug"
 ```
 NFC_PORT=COM20
 NFC_READER=pn532
-NFC_TRACE_LEVEL=warning
-NFC_TRACE=protocol,debug
+NFC_TRACE_LAYER=protocol,warning,error,app
+NFC_TRACE_LEVEL=protocol
 ```
 
 ## AI 编写脚本

{nfcscript-0.0.15 → nfcscript-0.0.16}/README.md

@@ -26,13 +26,13 @@ nfcscript test_card.py -p COM21
 nfcscript test_card.py -r acr122u
 
 # 开启追踪层
-nfcscript test_card.py --trace=protocol,debug
+nfcscript test_card.py --trace-layer=protocol,debug
 
 # 设置日志级别
-nfcscript test_card.py --level=trace
+nfcscript test_card.py --trace-level=driver
 
 # 组合使用
-nfcscript test_card.py -p COM21 -r pn532 --trace=protocol,debug --level=trace
+nfcscript test_card.py -p COM21 -r pn532 --trace-layer=protocol,debug --trace-level=driver
 ```
 
 ### nfc-cli - 交互式命令行
@@ -110,8 +110,8 @@ from nfc import *
 connect()
 
 # 开启追踪
-trace.driver = True
-trace.protocol = True
+trace.filter.driver = True
+trace.filter.protocol = True
 
 # 寻卡（自动切换协议解析器）
 card_info = active()
@@ -185,11 +185,11 @@ with session() as reader:
 
 | 属性 | 说明 |
 |------|------|
-| `trace.driver = True` | 启用 driver 层 |
-| `trace.protocol = True` | 启用 protocol 层 |
-| `trace.debug = False` | 禁用 debug 层 |
-| `trace.level = "warning"` | 设置最低日志级别 |
-| `trace.level = 30` | 或用数字 |
+| `trace.filter.driver = True` | 启用 driver 层 |
+| `trace.filter.protocol = True` | 启用 protocol 层 |
+| `trace.filter.debug = False` | 禁用 debug 层 |
+| `trace.filter.level = "warning"` | 设置最低日志级别 |
+| `trace.filter.level = 30` | 或用数字 |
 
 ```python
 # 简洁写法
@@ -197,9 +197,9 @@ trace.app("UID: AA BB CC DD")
 trace.debug("[auth] Rt: 80 81")
 
 # 属性控制
-trace.driver = True
-trace.protocol = True
-trace.level = "debug"
+trace.filter.driver = True
+trace.filter.protocol = True
+trace.filter.level = "debug"
 ```
 
 ### assertions.py
@@ -247,7 +247,7 @@ trace.level = "debug"
 |------|------|--------|
 | `NFC_PORT` | 串口号 | - |
 | `NFC_READER` | 读卡器类型 | - |
-| `NFC_TRACE` | 启用的层 (逗号分隔) | - |
+| `NFC_TRACE_LAYER` | 启用的层 (逗号分隔) | - |
 | `NFC_TRACE_LEVEL` | 最低日志级别 | `warning` |
 | `NFC_CARD_PATH` | 外部卡片模块搜索路径 (分号分隔) | - |
 
@@ -263,8 +263,8 @@ trace.level = "debug"
 ```
 NFC_PORT=COM20
 NFC_READER=pn532
-NFC_TRACE_LEVEL=warning
-NFC_TRACE=protocol,debug
+NFC_TRACE_LAYER=protocol,warning,error,app
+NFC_TRACE_LEVEL=protocol
 ```
 
 ## AI 编写脚本

{nfcscript-0.0.15 → nfcscript-0.0.16}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nfcscript"
-version = "0.0.15"
+version = "0.0.16"
 description = "A plugin-based core engine for DSL-style NFC testing automation."
 readme = "README.md"
 requires-python = ">=3.14"
@@ -34,7 +34,7 @@ dev = [
 ]
 
 [tool.bumpversion]
-current_version = "0.0.15"
+current_version = "0.0.16"
 commit = true
 tag = true
 allow_dirty = true

{nfcscript-0.0.15 → nfcscript-0.0.16}/src/nfc/cli.py

@@ -41,8 +41,8 @@ def main():
     parser.add_argument("script", help="脚本文件路径")
     parser.add_argument("-p", "--port", default=None, help="串口号 (默认: NFC_PORT 环境变量或 COM20)")
     parser.add_argument("-r", "--reader", default=None, help="读卡器类型 (默认: NFC_READER 环境变量或 pn532)")
-    parser.add_argument("--trace", default=None, help="启用的层 (逗号分隔: driver,debug,protocol,warning,error,app,all)")
-    parser.add_argument("--level", default=None, help="最低日志级别 (trace/debug/warning/error/app, 默认: warning)")
+    parser.add_argument("--trace-layer", default=None, help="启用的层 (逗号分隔: driver,debug,protocol,warning,error,app,all)")
+    parser.add_argument("--trace-level", default=None, help="最低日志级别 (driver/debug/protocol/warning/error/app, 默认: warning)")
 
     args, extra = parser.parse_known_args()
 
@@ -64,23 +64,23 @@ def main():
 
     from nfc import trace
 
-    # 解析 --trace: 启用指定层
-    trace_env = os.environ.get("NFC_TRACE", "")
-    trace_arg = args.trace or trace_env
+    # 解析 --trace-layer: 启用指定层 (调试用，默认已开启 protocol/warning/error/app)
+    trace_env = os.environ.get("NFC_TRACE_LAYER", "")
+    trace_arg = args.trace_layer or trace_env
     if trace_arg:
-        trace.set_level("trace")  # 允许所有层可见
+        trace.filter.level = "driver"  # 允许所有层可见
         for name in trace_arg.split(","):
             name = name.strip().lower()
             if name == "all":
                 for layer in ["driver", "debug", "protocol", "warning", "error", "app"]:
-                    trace.set_layer(layer, True)
+                    setattr(trace.filter, layer, True)
             elif name:
-                trace.set_layer(name, True)
+                setattr(trace.filter, name, True)
 
-    # 解析 --level: 最低级别过滤
+    # 解析 --trace-level: 最低级别过滤
     level_env = os.environ.get("NFC_TRACE_LEVEL", "warning")
-    level_arg = args.level or level_env
-    trace.set_level(level_arg)
+    level_arg = args.trace_level or level_env
+    trace.filter.level = level_arg
 
     run_script(args.script)
 

{nfcscript-0.0.15 → nfcscript-0.0.16}/src/nfc/trace.py

@@ -4,9 +4,7 @@ NFC Script Trace 模块
 统一日志 API，包装 nfctester.trace 的 6 层日志系统。
 层: driver, debug, protocol, warning, error, app
 
-支持两种控制方式：
-1. 属性控制: trace.driver = True, trace.level = "warning"
-2. 方法控制: trace.set_layer("driver", True), trace.set_level("warning")
+过滤器控制: trace.filter.driver = True, trace.filter.level = "warning"
 """
 
 from typing import Callable
@@ -55,27 +53,6 @@ def __getattr__(name):
     return getattr(_trace, name)
 
 
-def set_layer(layer: str, enable: bool = True):
-    """
-    开启或关闭追踪层。
-
-    Args:
-        layer: 层级名称 ("driver", "debug", "protocol", "warning", "error", "app")
-        enable: True 开启，False 关闭
-    """
-    _trace.set_layer(layer, enable)
-
-
-def set_level(level: str):
-    """
-    设置最低日志级别。
-
-    Args:
-        level: 级别名称 ("trace", "debug", "warning", "error", "app")
-    """
-    _trace.set_level(level)
-
-
 def set_parse(level: int = 1):
     """
     设置解析级别。

{nfcscript-0.0.15 → nfcscript-0.0.16}/src/nfcscript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nfcscript
-Version: 0.0.15
+Version: 0.0.16
 Summary: A plugin-based core engine for DSL-style NFC testing automation.
 Author: crthu
 Requires-Python: >=3.14
@@ -36,13 +36,13 @@ nfcscript test_card.py -p COM21
 nfcscript test_card.py -r acr122u
 
 # 开启追踪层
-nfcscript test_card.py --trace=protocol,debug
+nfcscript test_card.py --trace-layer=protocol,debug
 
 # 设置日志级别
-nfcscript test_card.py --level=trace
+nfcscript test_card.py --trace-level=driver
 
 # 组合使用
-nfcscript test_card.py -p COM21 -r pn532 --trace=protocol,debug --level=trace
+nfcscript test_card.py -p COM21 -r pn532 --trace-layer=protocol,debug --trace-level=driver
 ```
 
 ### nfc-cli - 交互式命令行
@@ -120,8 +120,8 @@ from nfc import *
 connect()
 
 # 开启追踪
-trace.driver = True
-trace.protocol = True
+trace.filter.driver = True
+trace.filter.protocol = True
 
 # 寻卡（自动切换协议解析器）
 card_info = active()
@@ -195,11 +195,11 @@ with session() as reader:
 
 | 属性 | 说明 |
 |------|------|
-| `trace.driver = True` | 启用 driver 层 |
-| `trace.protocol = True` | 启用 protocol 层 |
-| `trace.debug = False` | 禁用 debug 层 |
-| `trace.level = "warning"` | 设置最低日志级别 |
-| `trace.level = 30` | 或用数字 |
+| `trace.filter.driver = True` | 启用 driver 层 |
+| `trace.filter.protocol = True` | 启用 protocol 层 |
+| `trace.filter.debug = False` | 禁用 debug 层 |
+| `trace.filter.level = "warning"` | 设置最低日志级别 |
+| `trace.filter.level = 30` | 或用数字 |
 
 ```python
 # 简洁写法
@@ -207,9 +207,9 @@ trace.app("UID: AA BB CC DD")
 trace.debug("[auth] Rt: 80 81")
 
 # 属性控制
-trace.driver = True
-trace.protocol = True
-trace.level = "debug"
+trace.filter.driver = True
+trace.filter.protocol = True
+trace.filter.level = "debug"
 ```
 
 ### assertions.py
@@ -257,7 +257,7 @@ trace.level = "debug"
 |------|------|--------|
 | `NFC_PORT` | 串口号 | - |
 | `NFC_READER` | 读卡器类型 | - |
-| `NFC_TRACE` | 启用的层 (逗号分隔) | - |
+| `NFC_TRACE_LAYER` | 启用的层 (逗号分隔) | - |
 | `NFC_TRACE_LEVEL` | 最低日志级别 | `warning` |
 | `NFC_CARD_PATH` | 外部卡片模块搜索路径 (分号分隔) | - |
 
@@ -273,8 +273,8 @@ trace.level = "debug"
 ```
 NFC_PORT=COM20
 NFC_READER=pn532
-NFC_TRACE_LEVEL=warning
-NFC_TRACE=protocol,debug
+NFC_TRACE_LAYER=protocol,warning,error,app
+NFC_TRACE_LEVEL=protocol
 ```
 
 ## AI 编写脚本

{nfcscript-0.0.15 → nfcscript-0.0.16}/tests/test_cli.py

@@ -1,8 +1,8 @@
-"""cli 模块测试 (_find_dotenv_all / _parse_level / run_script)"""
+"""cli 模块测试 (_find_dotenv_all / run_script)"""
 import os
 import pytest
 from unittest.mock import patch, MagicMock
-from nfc.cli import _find_dotenv_all, _parse_level
+from nfc.cli import _find_dotenv_all
 
 
 class TestFindDotenvAll:
@@ -34,46 +34,6 @@ class TestFindDotenvAll:
         assert result[0] != result[1]
 
 
-class TestParseLevel:
-
-    def test_zero(self):
-        assert _parse_level("0") == 0
-
-    def test_false(self):
-        assert _parse_level("false") == 0
-
-    def test_off(self):
-        assert _parse_level("off") == 0
-
-    def test_one(self):
-        assert _parse_level("1") == 1
-
-    def test_simple(self):
-        assert _parse_level("simple") == 1
-
-    def test_summary(self):
-        assert _parse_level("summary") == 1
-
-    def test_two(self):
-        assert _parse_level("2") == 2
-
-    def test_full(self):
-        assert _parse_level("full") == 2
-
-    def test_tree(self):
-        assert _parse_level("tree") == 2
-
-    def test_case_insensitive(self):
-        assert _parse_level("FULL") == 2
-        assert _parse_level("False") == 0
-
-    def test_unknown_falls_to_1(self):
-        assert _parse_level("unknown") == 1
-
-    def test_whitespace(self):
-        assert _parse_level("  2  ") == 2
-
-
 class TestRunScript:
 
     def test_runs_script(self, tmp_path):

{nfcscript-0.0.15 → nfcscript-0.0.16}/tests/test_trace.py

@@ -3,32 +3,6 @@ from unittest.mock import patch, MagicMock
 from nfc import trace
 
 
-class TestSetLayer:
-
-    @patch("nfc.trace._trace")
-    def test_set_layer_enable(self, mock_trace):
-        trace.set_layer("DRIVER", True)
-        mock_trace.set_layer.assert_called_once_with("DRIVER", True)
-
-    @patch("nfc.trace._trace")
-    def test_set_layer_disable(self, mock_trace):
-        trace.set_layer("PROTOCOL", False)
-        mock_trace.set_layer.assert_called_once_with("PROTOCOL", False)
-
-    @patch("nfc.trace._trace")
-    def test_set_layer_default_enable(self, mock_trace):
-        trace.set_layer("DRIVER")
-        mock_trace.set_layer.assert_called_once_with("DRIVER", True)
-
-
-class TestSetLevel:
-
-    @patch("nfc.trace._trace")
-    def test_set_level(self, mock_trace):
-        trace.set_level("DEBUG")
-        mock_trace.set_level.assert_called_once_with("DEBUG")
-
-
 class TestSetParse:
 
     @patch("nfc.trace._trace")
@@ -54,12 +28,17 @@ class TestLogFunctions:
         trace.warning("warn message")
         mock_trace.warning.assert_called_once_with("warn message")
 
-    @patch("nfc.trace._trace")
-    def test_success(self, mock_trace):
-        trace.success("ok message")
-        mock_trace.success.assert_called_once_with("ok message")
-
     @patch("nfc.trace._trace")
     def test_debug(self, mock_trace):
         trace.debug("debug message")
         mock_trace.debug.assert_called_once_with("debug message")
+
+    @patch("nfc.trace._trace")
+    def test_app(self, mock_trace):
+        trace.app("app message")
+        mock_trace.app.assert_called_once_with("app message")
+
+    @patch("nfc.trace._trace")
+    def test_log(self, mock_trace):
+        trace.log("log message", layer="debug")
+        mock_trace.log.assert_called_once_with("log message", "debug")