devbits 1.3.2__tar.gz → 1.3.3__tar.gz

{devbits-1.3.2 → devbits-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devbits
-Version: 1.3.2
+Version: 1.3.3
 Summary: A lightweight CLI toolkit for daily development utilities.
 Author: Bruce Chuang
 License-Expression: MIT

{devbits-1.3.2 → devbits-1.3.3}/devbits/__init__.py

@@ -1,3 +1,3 @@
 """devbits: A lightweight CLI toolkit for daily development utilities."""
 
-__version__ = "1.3.2"
+__version__ = "1.3.3"

{devbits-1.3.2 → devbits-1.3.3}/devbits/gui.py

@@ -1763,7 +1763,7 @@ def _has_audio(path: Path) -> bool:
         out = subprocess.run(
             [probe, "-v", "error", "-select_streams", "a",
              "-show_entries", "stream=codec_type", "-of", "csv=p=0", str(path)],
-            capture_output=True, text=True, timeout=15,
+            capture_output=True, text=True, errors="replace", timeout=15,
         )
         return "audio" in out.stdout
     except (subprocess.SubprocessError, OSError):
@@ -2116,7 +2116,7 @@ class _Handler(BaseHTTPRequestHandler):
         global _export_progress
         proc = subprocess.Popen(
             cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-            text=True, bufsize=1,
+            text=True, errors="replace", bufsize=1,
         )
         try:
             for line in proc.stdout:

{devbits-1.3.2 → devbits-1.3.3}/devbits/network.py

@@ -1,7 +1,10 @@
 from __future__ import annotations
 
+import codecs
 import concurrent.futures
+import functools
 import ipaddress
+import locale
 import platform
 import re
 import socket
@@ -34,6 +37,48 @@ class Device:
     is_gateway: bool = False
 
 
+@functools.lru_cache(maxsize=1)
+def _console_encoding() -> str:
+    """The encoding the OS command-line tools print in.
+
+    On Windows this is the console output code page (e.g. ``cp950`` on a
+    Traditional Chinese install), *not* UTF-8. Elsewhere the locale's preferred
+    encoding is right.
+    """
+    if platform.system().lower() == "windows":
+        try:
+            import ctypes
+
+            codepage = ctypes.windll.kernel32.GetConsoleOutputCP() or ctypes.windll.kernel32.GetOEMCP()
+            codecs.lookup(f"cp{codepage}")  # reject code pages Python can't handle
+            return f"cp{codepage}"
+        except Exception:
+            pass
+    try:
+        return codecs.lookup(locale.getpreferredencoding(False)).name
+    except Exception:
+        return "utf-8"
+
+
+def _run_text(cmd: list[str], timeout: float) -> tuple[int, str]:
+    """Run ``cmd`` and return ``(returncode, stdout)``, decoded defensively.
+
+    Deliberately *not* ``text=True``: that decodes with UTF-8 strictly, so on a
+    non-English Windows the UnicodeDecodeError is raised inside subprocess'
+    reader threads, which leaves ``stdout`` as ``None`` and produces a confusing
+    ``'NoneType' object has no attribute ...`` far from the real cause. Decoding
+    the bytes here with ``errors="replace"`` cannot fail, and everything we parse
+    out of these tools (IPs, MACs, ``TTL=``) is ASCII anyway.
+    """
+    proc = subprocess.run(cmd, capture_output=True, timeout=timeout)
+    raw = proc.stdout
+    if raw is None:
+        return proc.returncode, ""
+    if isinstance(raw, str):  # a text-mode fake / caller override
+        return proc.returncode, raw
+    return proc.returncode, raw.decode(_console_encoding(), "replace")
+
+
 def local_ip() -> str:
     """Best-effort primary IPv4 address of this machine.
 
@@ -69,7 +114,7 @@ def gateway_ip() -> str | None:
     system = platform.system().lower()
     try:
         if system == "windows":
-            out = subprocess.run(["route", "print", "0.0.0.0"], capture_output=True, text=True, timeout=5).stdout
+            out = _run_text(["route", "print", "0.0.0.0"], timeout=5)[1]
             for line in out.splitlines():
                 if line.strip().startswith("0.0.0.0"):
                     ips = _IP_RE.findall(line)
@@ -77,11 +122,11 @@ def gateway_ip() -> str | None:
                         return ips[2]  # destination, netmask, gateway
             return None
         if system == "darwin":
-            out = subprocess.run(["route", "-n", "get", "default"], capture_output=True, text=True, timeout=5).stdout
+            out = _run_text(["route", "-n", "get", "default"], timeout=5)[1]
             match = re.search(r"gateway:\s*(" + _IP_RE.pattern + ")", out)
             return match.group(1) if match else None
         # Linux and other Unixes
-        out = subprocess.run(["ip", "route"], capture_output=True, text=True, timeout=5).stdout
+        out = _run_text(["ip", "route"], timeout=5)[1]
         match = re.search(r"default via (" + _IP_RE.pattern + ")", out)
         return match.group(1) if match else None
     except Exception:
@@ -170,7 +215,7 @@ def arp_table() -> dict[str, str]:
 
     for command in commands:
         try:
-            out = subprocess.run(command, capture_output=True, text=True, timeout=10).stdout
+            out = _run_text(command, timeout=10)[1]
         except Exception:
             continue
         table: dict[str, str] = {}
@@ -193,15 +238,16 @@ def _ping(ip: str, timeout: float = 1.0) -> bool:
     else:
         cmd = ["ping", "-c", "1", "-W", str(max(1, int(round(timeout)))), ip]  # -W is seconds on Linux
     try:
-        result = subprocess.run(cmd, capture_output=True, text=True, timeout=timeout + 2)
+        returncode, out = _run_text(cmd, timeout=timeout + 2)
     except Exception:
         return False
-    if result.returncode != 0:
+    if returncode != 0:
         return False
     if system == "windows":
         # Windows ping can exit 0 while printing "Destination host unreachable"
         # (a reply from the gateway, not the target). Require a real echo reply.
-        return "ttl=" in result.stdout.lower()
+        # "TTL=" is ASCII in every locale, so this survives localized output.
+        return "ttl=" in out.lower()
     return True
 
 

{devbits-1.3.2 → devbits-1.3.3}/devbits.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devbits
-Version: 1.3.2
+Version: 1.3.3
 Summary: A lightweight CLI toolkit for daily development utilities.
 Author: Bruce Chuang
 License-Expression: MIT

{devbits-1.3.2 → devbits-1.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "devbits"
-version = "1.3.2"
+version = "1.3.3"
 description = "A lightweight CLI toolkit for daily development utilities."
 readme = "README.md"
 requires-python = ">=3.9"

{devbits-1.3.2 → devbits-1.3.3}/tests/test_cli.py

@@ -70,6 +70,7 @@ def test_arp_table_windows_command(monkeypatch) -> None:
     calls = []
 
     class _Result:
+        returncode = 0
         stdout = "  192.168.0.1           aa-bb-cc-dd-ee-ff     dynamic"
 
     def fake_run(cmd, **kwargs):
@@ -95,6 +96,7 @@ def test_arp_table_linux_falls_back_to_ip_neigh(monkeypatch) -> None:
             raise FileNotFoundError("arp not installed")
 
         class _Result:
+            returncode = 0
             stdout = "192.168.0.1 dev eth0 lladdr aa:bb:cc:dd:ee:ff REACHABLE"
 
         return _Result()
@@ -106,6 +108,47 @@ def test_arp_table_linux_falls_back_to_ip_neigh(monkeypatch) -> None:
     assert table == {"192.168.0.1": "aa:bb:cc:dd:ee:ff"}
 
 
+def test_subprocess_output_survives_non_utf8_locale(monkeypatch) -> None:
+    # A Traditional Chinese Windows prints cp950 bytes, which are not valid
+    # UTF-8. Decoding must not raise, and ping must still detect the reply.
+    import subprocess
+
+    import devbits.network as net
+
+    # "回覆自 192.168.50.138: 位元組=32 時間<1ms TTL=64" in cp950.
+    cp950 = (
+        "回覆自 192.168.50.138: 位元組=32 時間<1ms TTL=64".encode("cp950")
+    )
+
+    def fake_run(cmd, **kwargs):
+        assert not kwargs.get("text"), "text=True decodes as UTF-8 and crashes here"
+        return subprocess.CompletedProcess(cmd, 0, cp950, b"")
+
+    monkeypatch.setattr(net.platform, "system", lambda: "Windows")
+    monkeypatch.setattr(net.subprocess, "run", fake_run)
+    net._console_encoding.cache_clear()
+    monkeypatch.setattr(net, "_console_encoding", lambda: "cp950")
+
+    assert net._ping("192.168.50.138") is True
+
+
+def test_ping_tolerates_undecodable_bytes(monkeypatch) -> None:
+    # Even if the code page guess is wrong, no byte sequence may raise.
+    import subprocess
+
+    import devbits.network as net
+
+    def fake_run(cmd, **kwargs):
+        return subprocess.CompletedProcess(cmd, 0, b"\xa4\xa8 TTL=64 \xff\xfe", b"")
+
+    monkeypatch.setattr(net.platform, "system", lambda: "Windows")
+    monkeypatch.setattr(net.subprocess, "run", fake_run)
+    net._console_encoding.cache_clear()
+    monkeypatch.setattr(net, "_console_encoding", lambda: "utf-8")
+
+    assert net._ping("192.168.50.138") is True
+
+
 def test_private_mac_detection() -> None:
     from devbits.network import is_private_mac