Address PR comments

Author: akhilles

crates/pcb-layout/src/lib.rs

@@ -437,7 +437,7 @@ pub fn process_layout(
             .expect("Failed to create temporary directory")
             .keep()
     } else {
-        match utils::resolve_layout_dir(schematic) {
+        match utils::resolve_layout_dir(schematic)? {
             Some(path) => path,
             None => return Ok(None),
         }
@@ -592,17 +592,22 @@ pub mod utils {
     use pcb_sch::InstanceKind;
     use std::collections::HashMap;
 
-    /// Extract layout path from schematic's root instance attributes
     /// Resolve layout directory from schematic.
-    /// Returns None if the schematic has no layout_path attribute.
-    pub fn resolve_layout_dir(schematic: &Schematic) -> Option<PathBuf> {
-        let root_ref = schematic.root_ref.as_ref()?;
-        let root = schematic.instances.get(root_ref)?;
-        let layout_uri = root
-            .attributes
-            .get(ATTR_LAYOUT_PATH)
-            .and_then(|v| v.string())?;
-        schematic.resolve_package_uri(layout_uri).ok()
+    /// Returns `Ok(None)` if no `layout_path` attribute is set.
+    pub fn resolve_layout_dir(schematic: &Schematic) -> anyhow::Result<Option<PathBuf>> {
+        let uri = schematic
+            .root_ref
+            .as_ref()
+            .and_then(|r| schematic.instances.get(r))
+            .and_then(|inst| inst.attributes.get(ATTR_LAYOUT_PATH))
+            .and_then(|v| v.string());
+        match uri {
+            None => Ok(None),
+            Some(s) => schematic
+                .resolve_package_uri(s)
+                .map(Some)
+                .with_context(|| format!("Failed to resolve layout_path '{s}'")),
+        }
     }
 
     pub const DEFAULT_KICAD_BASENAME: &str = "layout";

crates/pcb-layout/src/scripts/lens/tests/test_adapter.py

@@ -557,7 +557,9 @@ def set_field(name, value):
 
         footprint_lib_map = {"Resistor_SMD": "/path/to/lib"}
 
-        _create_footprint(view, complement, mock_board, mock_pcbnew, footprint_lib_map, {}, None)
+        _create_footprint(
+            view, complement, mock_board, mock_pcbnew, footprint_lib_map, {}, None
+        )
 
         # Custom fields should be hidden
         assert visibility_calls.get("Path") is False

crates/pcb-sch/src/lib.rs

@@ -105,6 +105,7 @@ pub fn format_package_uri(abs: &Path, package_roots: &BTreeMap<String, PathBuf>)
     if rel_str.is_empty() {
         Some(format!("{PACKAGE_URI_PREFIX}{pkg_url}"))
     } else {
+        let rel_str = rel_str.replace('\\', "/");
         Some(format!("{PACKAGE_URI_PREFIX}{pkg_url}/{rel_str}"))
     }
 }

crates/pcb/src/open.rs

@@ -36,7 +36,7 @@ pub fn execute(args: OpenArgs) -> Result<()> {
         .map_err(|_| anyhow::anyhow!("Build failed for {}", file_name))?;
 
     let schematic = output.to_schematic()?;
-    let layout_dir = utils::resolve_layout_dir(&schematic)
+    let layout_dir = utils::resolve_layout_dir(&schematic)?
         .ok_or_else(|| anyhow::anyhow!("No layout path defined in {}", file_name))?;
 
     let kicad_files = utils::require_kicad_files(&layout_dir)?;

crates/pcb/src/route.rs

@@ -60,7 +60,7 @@ pub fn execute(args: RouteArgs) -> Result<()> {
 
     let schematic = output.context("No schematic output from evaluation")?;
 
-    let layout_dir = utils::resolve_layout_dir(&schematic)
+    let layout_dir = utils::resolve_layout_dir(&schematic)?
         .context("No layout path defined in schematic. Add layout=\"path\" to your module.")?;
 
     // Discover KiCad project + board paths