sdev 0.7.11__tar.gz → 0.7.12__tar.gz

{sdev-0.7.11/sdev.egg-info → sdev-0.7.12}/PKG-INFO

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

{sdev-0.7.11 → sdev-0.7.12}/pyproject.toml

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

{sdev-0.7.11 → sdev-0.7.12}/sdev/cli/__init__.py

@@ -493,97 +493,97 @@ def _handle_list(args: argparse.Namespace) -> int:
         scan_local = scope != "remote"
         scan_remote = scope != "local"
 
-    # 本地与远程扫描分别封装为任务，由 spinner 展示进度。
-    def _scan_local_task(ports: List[str]) -> List[Dict[str, Any]]:
-        entries: List[Dict[str, Any]] = []
-        if not ports:
-            return entries
-
-        def _check_one(port: str) -> Tuple[str, Dict[str, Any]]:
-            r = check_port_alive_nonblock(port, baudrate=115200, timeout=1.5)
-            return (port, r)
-
-        alive_ports: List[str] = []
-        results: List[Tuple[str, Dict[str, Any]]] = []
-        fast_exit = False
-        ex = ThreadPoolExecutor(max_workers=max(len(ports), 1))
-        try:
-            futs = {ex.submit(_check_one, p): p for p in ports}
-            if fast:
-                for fut in as_completed(futs):
-                    port, r = fut.result()
-                    results.append((port, r))
-                    if r.get("available"):
-                        fast_exit = True
-                        alive_ports = [port]
-                        break
-            else:
-                for fut in as_completed(futs):
-                    results.append(fut.result())
-                results.sort(key=lambda x: x[0])
-                for port, r in results:
-                    if r.get("available"):
-                        alive_ports.append(port)
-        finally:
-            ex.shutdown(wait=not fast_exit)
-
-        def _model_one(port: str) -> Tuple[str, str]:
+        # 本地与远程扫描分别封装为任务，由 spinner 展示进度。
+        def _scan_local_task(ports: List[str]) -> List[Dict[str, Any]]:
+            entries: List[Dict[str, Any]] = []
+            if not ports:
+                return entries
+    
+            def _check_one(port: str) -> Tuple[str, Dict[str, Any]]:
+                r = check_port_alive_nonblock(port, baudrate=115200, timeout=1.5)
+                return (port, r)
+    
+            alive_ports: List[str] = []
+            results: List[Tuple[str, Dict[str, Any]]] = []
+            fast_exit = False
+            ex = ThreadPoolExecutor(max_workers=max(len(ports), 1))
             try:
-                with SerialNotebook(device=port, baudrate=115200) as nb:
-                    return (port, nb.get_model_type(timeout=2.0, verbose=False) or "unknown")
-            except Exception as e:
-                return (port, f"error: {e}")
-
-        if alive_ports:
-            model_results: List[Tuple[str, str]] = []
-            with ThreadPoolExecutor(max_workers=max(len(alive_ports), 1)) as ex2:
-                futs = {ex2.submit(_model_one, p): p for p in alive_ports}
-                for fut in as_completed(futs):
-                    model_results.append(fut.result())
-            model_results.sort(key=lambda x: x[0])
-            for port, device_type in model_results:
-                entries.append({
-                    "host": "localhost",
-                    "device": port,
-                    "device_id": _device_id("localhost", port),
-                    "device_type": device_type if not device_type.startswith("error:") else "unknown",
-                    "last_update": now,
-                })
-        return entries
-
-    def _scan_remote_task() -> List[Dict[str, Any]]:
-        entries: List[Dict[str, Any]] = []
-        hosts = get_remote_hosts()
-        # print(f"[debug] remote hosts found by discovery: {hosts}")
-        if not hosts:
-            return entries
-        for host, service_port in hosts:
-            # print(f"[debug] fetching boards from {host}:{service_port}...")
-            boards = fetch_boards_from_host(host, service_port, timeout=10.0)
-            # print(f"[debug] host {host} returned {len(boards)} boards")
-            for b in boards:
-                if not b.get("available"):
-                    continue
-                serial_dev = (b.get("device") or b.get("port") or "").strip()
-                if not serial_dev:
-                    continue
-                baud = int(b.get("baudrate") or 115200)
-                device_type = "unknown"
+                futs = {ex.submit(_check_one, p): p for p in ports}
+                if fast:
+                    for fut in as_completed(futs):
+                        port, r = fut.result()
+                        results.append((port, r))
+                        if r.get("available"):
+                            fast_exit = True
+                            alive_ports = [port]
+                            break
+                else:
+                    for fut in as_completed(futs):
+                        results.append(fut.result())
+                    results.sort(key=lambda x: x[0])
+                    for port, r in results:
+                        if r.get("available"):
+                            alive_ports.append(port)
+            finally:
+                ex.shutdown(wait=not fast_exit)
+    
+            def _model_one(port: str) -> Tuple[str, str]:
                 try:
-                    with SerialNotebook(device=serial_dev, baudrate=baud, host=host, port=service_port) as nb:
-                        device_type = nb.get_model_type(timeout=3.0, verbose=False) or "unknown"
+                    with SerialNotebook(device=port, baudrate=115200) as nb:
+                        return (port, nb.get_model_type(timeout=2.0, verbose=False) or "unknown")
                 except Exception as e:
-                    # 如果报错，说明连接或者握手阶段就出问题了
-                    # print(f"[debug] failed to get model type from {host}:{serial_dev}: {e}")
+                    return (port, f"error: {e}")
+    
+            if alive_ports:
+                model_results: List[Tuple[str, str]] = []
+                with ThreadPoolExecutor(max_workers=max(len(alive_ports), 1)) as ex2:
+                    futs = {ex2.submit(_model_one, p): p for p in alive_ports}
+                    for fut in as_completed(futs):
+                        model_results.append(fut.result())
+                model_results.sort(key=lambda x: x[0])
+                for port, device_type in model_results:
+                    entries.append({
+                        "host": "localhost",
+                        "device": port,
+                        "device_id": _device_id("localhost", port),
+                        "device_type": device_type if not device_type.startswith("error:") else "unknown",
+                        "last_update": now,
+                    })
+            return entries
+    
+        def _scan_remote_task() -> List[Dict[str, Any]]:
+            entries: List[Dict[str, Any]] = []
+            hosts = get_remote_hosts()
+            # print(f"[debug] remote hosts found by discovery: {hosts}")
+            if not hosts:
+                return entries
+            for host, service_port in hosts:
+                # print(f"[debug] fetching boards from {host}:{service_port}...")
+                boards = fetch_boards_from_host(host, service_port, timeout=10.0)
+                # print(f"[debug] host {host} returned {len(boards)} boards")
+                for b in boards:
+                    if not b.get("available"):
+                        continue
+                    serial_dev = (b.get("device") or b.get("port") or "").strip()
+                    if not serial_dev:
+                        continue
+                    baud = int(b.get("baudrate") or 115200)
                     device_type = "unknown"
-                entries.append({
-                    "host": host,
-                    "device": serial_dev,
-                    "device_id": _device_id(host, serial_dev),
-                    "device_type": device_type if not device_type.startswith("error:") else "unknown",
-                    "last_update": now,
-                })
-        return entries
+                    try:
+                        with SerialNotebook(device=serial_dev, baudrate=baud, host=host, port=service_port) as nb:
+                            device_type = nb.get_model_type(timeout=3.0, verbose=False) or "unknown"
+                    except Exception as e:
+                        # 如果报错，说明连接或者握手阶段就出问题了
+                        # print(f"[debug] failed to get model type from {host}:{serial_dev}: {e}")
+                        device_type = "unknown"
+                    entries.append({
+                        "host": host,
+                        "device": serial_dev,
+                        "device_id": _device_id(host, serial_dev),
+                        "device_type": device_type if not device_type.startswith("error:") else "unknown",
+                        "last_update": now,
+                    })
+            return entries
 
         specs: List[Tuple[str, Any]] = []
         local_entries: List[Dict[str, Any]] = []

{sdev-0.7.11 → sdev-0.7.12/sdev.egg-info}/PKG-INFO

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

{sdev-0.7.11 → sdev-0.7.12}/setup.py

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