KiCad - the KiCad Bridge

@@ -110,6 +110,39 @@ def _install_footprint(kicad_info: dict, args: dict) -> dict:             if source.suffix == ".kicad_mod":                 _add_model_to_footprint(pretty_dir / source.name, model_installed_path) +    # Library-bundle 3D models (Adom wiki Cloud Library bundles): a directory+    # of model files (modelsPath arg), or auto-detected as a `3dmodels/`+    # sibling of the source .pretty (the bundle layout). The bundle's+    # footprints reference models by RELATIVE `3dmodels/<file>` paths, which+    # KiCad resolves against the PROJECT dir, not the library — so after+    # copying the models into the user's 3dmodels/<lib>.3dshapes dir, rewrite+    # the COPIED footprints' matching refs to the absolute installed path+    # (forward slashes). Absolute matches this installer's existing+    # convention: the fp-lib-table URI it writes is absolute already. The+    # SOURCE .pretty is never modified.+    models_installed = 0+    refs_rewritten = 0+    models_src = args.get("modelsPath", "")+    if not models_src and source.is_dir() and source.suffix == ".pretty":+        sibling = source.parent / "3dmodels"+        if sibling.is_dir():+            models_src = str(sibling)+    if models_src:+        models_src_dir = Path(models_src)+        if models_src_dir.is_dir():+            models_dir = Path(user_dir) / "3dmodels" / f"{lib_name}.3dshapes"+            models_dir.mkdir(parents=True, exist_ok=True)+            installed_by_name = {}+            for mf in sorted(models_src_dir.iterdir()):+                if not mf.is_file():+                    continue+                dest_model = models_dir / mf.name+                shutil.copy2(str(mf), str(dest_model))+                installed_by_name[mf.name] = str(dest_model).replace("\\", "/")+                models_installed += 1+            if installed_by_name:+                refs_rewritten = _rewrite_model_refs(pretty_dir, installed_by_name)+     # Register in fp-lib-table     table_path = Path(config_dir) / "fp-lib-table"     table = LibTable.parse_file(str(table_path))@@ -150,10 +183,42 @@ def _install_footprint(kicad_info: dict, args: dict) -> dict:     if model_installed_path:         result["data"]["model3dPath"] = model_installed_path         result["output"] += f". 3D model installed to {model_installed_path}"+    if models_installed:+        result["data"]["modelsInstalled"] = models_installed+        result["data"]["modelRefsRewritten"] = refs_rewritten+        result["output"] += (+            f". {models_installed} 3D model(s) installed to 3dmodels/{lib_name}.3dshapes; "+            f"{refs_rewritten} footprint model ref(s) rewritten to the installed paths"+        )      return result  +def _rewrite_model_refs(pretty_dir: Path, installed_by_name: dict) -> int:+    """Rewrite (model "...") refs in every .kicad_mod under pretty_dir whose+    BASENAME matches an installed model file, pointing them at the absolute+    installed path. Refs to models we did not install are left untouched+    (they may be stock ${KICAD*_3DMODEL_DIR} refs that already resolve)."""+    rewritten = 0++    def _sub(match):+        nonlocal rewritten+        ref = match.group(2)+        base = ref.replace("\\", "/").rsplit("/", 1)[-1]+        dest = installed_by_name.get(base)+        if not dest:+            return match.group(0)+        rewritten += 1+        return f'{match.group(1)}"{dest}"'++    for mod in sorted(pretty_dir.glob("*.kicad_mod")):+        text = mod.read_text(encoding="utf-8")+        new_text = re.sub(r'(\(model\s+)"([^"]+)"', _sub, text)+        if new_text != text:+            mod.write_text(new_text, encoding="utf-8")+    return rewritten++ def _add_model_to_footprint(footprint_path: Path, model_path: str):     """Add a (model ...) reference to a .kicad_mod file."""     text = footprint_path.read_text(encoding="utf-8")