driverclient 0.2.1__tar.gz → 0.2.2__tar.gz

{driverclient-0.2.1 → driverclient-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: driverclient
-Version: 0.2.1
+Version: 0.2.2
 Summary: Driver Server client with an embeddable connector for config injection at runtime.
 Project-URL: Homepage, https://example.com/driverclient
 Author-email: Raja Sanaullah <sanaullah@99technologies.com>

{driverclient-0.2.1 → driverclient-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "driverclient"
-version = "0.2.1"
+version = "0.2.2"
 description = "Driver Server client with an embeddable connector for config injection at runtime."
 readme = "README.md"
 requires-python = ">=3.10"

{driverclient-0.2.1 → driverclient-0.2.2}/src/driverclient/__init__.py

@@ -25,7 +25,7 @@ from driverclient.main import run as _run
 
 __all__ = ["DriverClient", "ClientEvent"]
 
-__version__ = "0.2.1"
+__version__ = "0.2.2"
 
 
 class DriverClient:

{driverclient-0.2.1 → driverclient-0.2.2}/src/driverclient/ops/capture.py

@@ -345,15 +345,36 @@ def _enumerate_packages_since(cutoff: datetime, cfg: dict) -> list[dict]:
     return result
 
 
+def _norm_hwid(hwid: str) -> str:
+    """Normalize an HWID for comparison: uppercase and strip the &REV_* tail.
+
+    The repo's `not_found` list carries the stripped HWID variants
+    (e.g. PCI\\VEN_8086&DEV_9D15&SUBSYS_222C17AA) while the IDs reported by the
+    live machine — both `installed_versions` keys and pnputil /enum-devices —
+    carry a &REV_xx suffix. Comparing the two forms verbatim never matches, so
+    both sides are normalized to the same REV-less, uppercase form.
+    """
+    up  = hwid.upper()
+    idx = up.find("&REV_")
+    return up[:idx] if idx != -1 else up
+
+
 def _find_installed_packages_for_hwids(
     not_found_hwids: set[str],
     scan_result: ScanResult,
     cfg: dict,
 ) -> list[dict]:
-    locally_installed = {
-        hwid for hwid in not_found_hwids
-        if hwid in scan_result.installed_versions
-    }
+    # A missing HWID is capturable when it belongs to a scanned device that
+    # already has a driver bound. Match on the device's own HWID list (which
+    # includes every variant) using normalized HWIDs, rather than exact
+    # membership in installed_versions whose keys are the full &REV_xx form.
+    not_found_norm = {_norm_hwid(h) for h in not_found_hwids}
+    locally_installed: set[str] = set()
+    for dev in scan_result.devices:
+        if not dev.has_driver:
+            continue
+        if any(_norm_hwid(h) in not_found_norm for h in dev.hwids):
+            locally_installed.update(h.upper() for h in dev.hwids)
     if not locally_installed:
         return []
 
@@ -395,8 +416,9 @@ def _map_hwids_to_published(hwids: set[str], cfg: dict) -> dict[str, str]:
 def _commit_hwid_block(state: dict, hwids: set[str], mapping: dict) -> None:
     """Flush accumulated HWIDs for the current device into mapping."""
     if state["published"]:
+        targets = {_norm_hwid(h) for h in hwids}
         for h in state["hwids"]:
-            if h in hwids:
+            if _norm_hwid(h) in targets:
                 mapping[h] = state["published"]
     state["published"] = ""
     state["hwids"]     = []

{driverclient-0.2.1 → driverclient-0.2.2}/src/driverclient/ops/install.py

@@ -38,6 +38,11 @@ _CATEGORY_ORDER: dict[str, int] = {
 #   1641 = ERROR_SUCCESS_REBOOT_INITIATED
 _REBOOT_CODES: frozenset[int] = frozenset({3010, 1641})
 
+# Installer exit codes that mean "succeeded, nothing to do" (NOT a failure).
+#   259 = ERROR_NO_MORE_ITEMS — pnputil added the package but no device needed
+#         updating (driver already present / "Already exists in the system").
+_SUCCESS_NO_CHANGE_CODES: frozenset[int] = frozenset({259})
+
 
 @dataclass
 class DriverResult:
@@ -230,10 +235,11 @@ def _classify(returncode: int, err_text: str = "") -> tuple[bool, str, bool]:
     Map an installer exit code to (success, error, reboot_required).
 
     0                  -> success, no reboot
+    259                -> success, no reboot (package already present / no change)
     3010 / 1641        -> success, reboot required (NOT a failure)
     anything else      -> failure, carry err_text
     """
-    if returncode == 0:
+    if returncode == 0 or returncode in _SUCCESS_NO_CHANGE_CODES:
         return True, "", False
     if returncode in _REBOOT_CODES:
         return True, "", True

{driverclient-0.2.1 → driverclient-0.2.2}/src/driverclient/ops/scan.py

@@ -9,6 +9,7 @@ Public API:
     scan(force=False) -> ScanResult
 """
 import json
+import re
 import subprocess
 from concurrent.futures import ThreadPoolExecutor
 from dataclasses import asdict, dataclass, field
@@ -62,6 +63,54 @@ class ScanResult:
         return [d for d in self.devices if d.has_driver]
 
 
+_ACPI_VENDEV = re.compile(r"^ACPI\\VEN_([^&]+)&DEV_(.+)$")
+
+
+def _canon_hwid(hwid: str) -> str:
+    """Fold the two HWID forms Windows reports for one device into one key.
+
+    `installed_versions` comes from Win32_PnPSignedDriver.HardWareID — the
+    canonical VEN_/DEV_ form with a &REV_xx tail, and ACPI IDs written as
+    ACPI\\VEN_INT&DEV_3394.  The HWIDs sent to /resolve come from pnputil
+    /enum-devices — raw form, no &REV, ACPI as ACPI\\INT3394.  Both collapse to
+    one comparable key: uppercase, &REV_* dropped, ACPI VEN_/DEV_ concatenated.
+    """
+    up  = hwid.upper()
+    idx = up.find("&REV_")
+    if idx != -1:
+        up = up[:idx]
+    m = _ACPI_VENDEV.match(up)
+    if m:
+        up = f"ACPI\\{m.group(1)}{m.group(2)}"
+    return up
+
+
+def _installed_prefix_index(installed_versions: dict[str, str]) -> dict[str, str]:
+    """Expand each canonical installed HWID into its &-boundary prefixes.
+
+    The installed key is the most-specific device ID
+    (PCI\\VEN_8086&DEV_9D15&SUBSYS_222C17AA&REV_F1) while /resolve frequently
+    matches on a shorter variant (PCI\\VEN_8086&DEV_9D15).  Emitting every
+    prefix that still contains &DEV_ lets the shorter form find the version.
+    The bare bus/vendor root (PCI\\VEN_8086) is skipped so an over-generic ID
+    can't be mislabelled as already-current.
+    """
+    idx: dict[str, str] = {}
+    for key, ver in installed_versions.items():
+        canon = _canon_hwid(key)
+        parts = canon.split("&")
+        acc   = parts[0]
+        prefixes = [acc]
+        for p in parts[1:]:
+            acc = f"{acc}&{p}"
+            prefixes.append(acc)
+        for pref in prefixes:
+            if "&" in canon and "&DEV_" not in pref:
+                continue  # skip bare bus/vendor root
+            idx.setdefault(pref, ver)
+    return idx
+
+
 def scan(force: bool = False) -> ScanResult:
     """
     Run a full hardware scan.  Loads from ds_scan.json cache if fresh
@@ -91,6 +140,19 @@ def scan(force: bool = False) -> ScanResult:
                         total=len(all_hwids))
         installed_versions = get_installed_versions(all_hwids)
 
+    # Re-key installed_versions onto the raw HWID strings the client sends to
+    # /resolve.  Win32_PnPSignedDriver reports the canonical VEN_/DEV_+REV form,
+    # which never matches the raw pnputil HWIDs verbatim — so without this the
+    # server's already-current check (and Device.installed_version below) miss
+    # every time and every repo-covered driver shows up as "to install".
+    if installed_versions:
+        prefix_idx = _installed_prefix_index(installed_versions)
+        for h in all_hwids:
+            if h not in installed_versions:
+                ver = prefix_idx.get(_canon_hwid(h))
+                if ver:
+                    installed_versions[h] = ver
+
     for dev in devices:
         ver = next(
             (installed_versions[h] for h in dev.hwids if h in installed_versions),