sdev 0.7.0__tar.gz → 0.7.2__tar.gz

{sdev-0.7.0/sdev.egg-info → sdev-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdev
-Version: 0.7.0
+Version: 0.7.2
 Summary: 串口控制器工具包
 Home-page: https://github.com/klrc/sdev
 Author: klrc

{sdev-0.7.0 → sdev-0.7.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sdev"
-version = "0.7.0"
+version = "0.7.2"
 description = "串口控制器工具包"
 readme = "README.md"
 license = {text = "MIT"}

{sdev-0.7.0 → sdev-0.7.2}/sdev/__init__.py

@@ -8,5 +8,5 @@
 from importlib import metadata as _metadata
 
 __version__ = _metadata.version("sdev")
-from .modules import CTRL_C, SerialCore, SerialRunner, scan_serial_ports, check_port_alive_nonblock  # noqa: F401
+from .modules import SerialNotebook
 

{sdev-0.7.0 → sdev-0.7.2}/sdev/modules/__init__.py

@@ -1,14 +1,14 @@
 from __future__ import annotations
 
-from .serial_rw import SerialRW, SerialRunner, scan_serial_ports, check_port_alive_nonblock
+from .serial_rw import SerialRW, scan_serial_ports, check_port_alive_nonblock
 from .serial_rw_server import SerialRWClient, SerialRWServer, DEFAULT_SERVICE_PORT
+from .serial_notebook import SerialNotebook
 
 __all__ = [
     "SerialRW",
-    "SerialRunner",
+    "SerialRWClient",
+    "SerialRWServer",
     "scan_serial_ports",
     "check_port_alive_nonblock",
     "DEFAULT_SERVICE_PORT",
-    "SerialRWClient",
-    "SerialRWServer",
 ]

{sdev-0.7.0 → sdev-0.7.2}/sdev/modules/serial_notebook.py

@@ -1,9 +1,10 @@
 
 import sys
 import time
-from serial_rw import SerialRW, SerialLine, CTRL_C
 from loguru import logger
 
+from .serial_rw import SerialRW, SerialLine, CTRL_C
+
 GREY = "\033[90m"
 YELLOW = "\033[33m"
 RED = "\033[31m"

{sdev-0.7.0 → sdev-0.7.2}/sdev/modules/serial_rw.py

@@ -259,59 +259,6 @@ class SerialRW():
 def serial_rw(device: str, baudrate: int = 115200):
     return SerialRW(device, baudrate)
 
-
-class SerialRunner:
-    """基于 SerialRW 的运行控制器。"""
-    def __init__(self, core: SerialRW):
-        self._core = core
-
-    def run(self, cmd, prompt_flag=" #", overall_timeout=None, response_timeout=None, wait_forever=False, stream=False, display=False):
-        self._core.drain_buffer()
-        YELLOW, GREY, RED, RESET = "\033[33m", "\033[90m", "\033[31m", "\033[0m"
-        
-        def _iter():
-            try:
-                if cmd and display: 
-                    sys.stdout.write(f"{YELLOW}> {cmd}{RESET}\n")
-                    sys.stdout.flush()
-                for line in self._core.forward(x=cmd, flag=prompt_flag, timeout=None if wait_forever else response_timeout):
-                    if line.kind == 'timeout': raise TimeoutError
-                    if display and line.kind == 'body':
-                        text = line.text
-                        if prompt_flag in text:
-                            text = text.replace(prompt_flag, f"\033[32m{prompt_flag}{RESET}{GREY}")
-                        sys.stdout.write(f"{GREY}{text}{RESET}")
-                        sys.stdout.flush()
-                    yield line.text
-                if display: 
-                    sys.stdout.write("\n\n")
-                    sys.stdout.flush()
-            except TimeoutError:
-                if display: 
-                    sys.stdout.write(f"\n{RED}<sdev timeout>{RESET}\n")
-                    sys.stdout.flush()
-                else: raise
-
-        gen = _iter()
-        return gen if stream else list(gen)
-
-    def send_interrupt(self):
-        try:
-            self._core.dry_send(CTRL_C)
-        except:
-            pass
-
-    def check_model_type(self, timeout=2.0):
-        try:
-            lines = self.run("cat /proc/device-tree/model 2>/dev/null; echo", prompt_flag=" #", response_timeout=timeout)
-            for l in reversed(lines):
-                s = l.strip().replace("\x00", "")
-                if s and " #" not in s: 
-                    return s.split("/")[0].strip()[:16].lower()
-        except: 
-            pass
-        return None
-
 if __name__ == "__main__":
     s = serial_rw("/dev/ttyUSB0", 115200)
     s.connect()

{sdev-0.7.0 → sdev-0.7.2/sdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdev
-Version: 0.7.0
+Version: 0.7.2
 Summary: 串口控制器工具包
 Home-page: https://github.com/klrc/sdev
 Author: klrc

{sdev-0.7.0 → sdev-0.7.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="sdev",
-    version="0.7.0",
+    version="0.7.2",
     author="klrc",
     author_email="144069824@qq.com",
     description="串口控制器工具包",