KiCad - the KiCad Bridge

@@ -179,6 +179,8 @@ pub fn now_utc_iso() -> String { /// What first-run seeding did: which files it wrote and which it left alone. #[derive(Clone, Debug, Default, PartialEq, Eq)] pub struct Seeded {+    /// Files that existed but were still KiCad's untouched defaults, so the seed was merged in.+    pub merged: Vec<String>,     pub written: Vec<String>,     pub skipped: Vec<String>,     pub errors: Vec<String>,@@ -227,6 +229,40 @@ pub fn first_run_documents() -> Vec<(&'static str, Value)> {     ] } +/// True when the file is KiCad's own untouched default: no first-run prompt answered.+pub fn is_pristine_common(doc: &Value) -> bool {+    let d = &doc["do_not_show_again"];+    d.is_object() && !truthy(&d["data_collection_prompt"]) && !truthy(&d["update_check_prompt"])+}++fn merge_value(into: &mut Value, from: &Value) {+    match (into, from) {+        (Value::Object(a), Value::Object(b)) => {+            for (k, v) in b {+                if k == "meta" { continue; } // KiCad's own schema version stays+                merge_value(a.entry(k.clone()).or_insert(Value::Null), v);+            }+        }+        (slot, v) => *slot = v.clone(),+    }+}++/// Merge the seed into an existing pristine kicad_common.json. Ok(false) = not pristine, untouched.+fn merge_into_pristine(path: &Path, seed: &Value) -> Result<bool, String> {+    let text = std::fs::read_to_string(path).map_err(|e| e.to_string())?;+    let mut doc: Value = serde_json::from_str(&text).map_err(|e| e.to_string())?;+    if !is_pristine_common(&doc) {+        return Ok(false);+    }+    let backup = path.with_file_name(format!("{}.adom-bak", path.file_name().unwrap_or_default().to_string_lossy()));+    if !backup.exists() {+        std::fs::write(&backup, &text).map_err(|e| e.to_string())?;+    }+    merge_value(&mut doc, seed);+    std::fs::write(path, serde_json::to_string_pretty(&doc).unwrap_or_default() + "\n").map_err(|e| e.to_string())?;+    Ok(true)+}+ /// Seed the first-run settings files into a per-version config dir, each written ONLY /// if absent (never on a settings file the user already has). Creates the dir when /// missing. Never panics; failures land in `Seeded.errors`.@@ -239,6 +275,18 @@ pub fn seed_first_run(config_dir: &Path) -> Seeded {     for (name, doc) in first_run_documents() {         let path = config_dir.join(name);         if path.exists() {+            // kicad-cli writes kicad_common.json with defaults the first time it runs, and the+            // installer's own verify step runs kicad-cli. Skipping an existing file therefore+            // skipped EVERY fresh box and the startup wizard showed anyway (winvm, 10.0.6).+            // A file whose first-run prompts are all unanswered has never been through the+            // wizard: nobody's choices live in it, so the seed is merged in (backup kept).+            if name == "kicad_common.json" {+                match merge_into_pristine(&path, &doc) {+                    Ok(true) => { out.merged.push(name.to_string()); continue; }+                    Ok(false) => {}+                    Err(e) => out.errors.push(format!("{name}: {e}")),+                }+            }             out.skipped.push(name.to_string());             continue;         }@@ -271,6 +319,27 @@ mod tests {         serde_json::from_str(&std::fs::read_to_string(p).unwrap()).unwrap()     } +    #[test]+    fn a_pristine_file_kicad_cli_wrote_is_merged_and_a_users_file_is_left_alone() {+        let t = tmp("pristine");+        let f = t.0.join("kicad_common.json");+        // what kicad-cli leaves behind on a blank box+        std::fs::write(&f, r#"{"meta":{"version":6},"api":{"enable_server":false,"interpreter_path":"x"},"graphics":{"canvas_type":0},"do_not_show_again":{"data_collection_prompt":false,"update_check_prompt":false,"zone_fill_warning":false}}"#).unwrap();+        let s = seed_first_run(&t.0);+        assert_eq!(s.merged, vec!["kicad_common.json".to_string()]);+        let d = read_json(&f);+        assert_eq!(d["do_not_show_again"]["data_collection_prompt"], json!(true));+        assert_eq!(d["api"]["enable_server"], json!(true));+        assert_eq!(d["api"]["interpreter_path"], json!("x"));+        assert_eq!(d["meta"]["version"], json!(6));+        assert!(t.0.join("kicad_common.json.adom-bak").exists());+        // the user has been through the wizard: their file is theirs+        std::fs::write(&f, r#"{"api":{"enable_server":false},"do_not_show_again":{"data_collection_prompt":true,"update_check_prompt":true}}"#).unwrap();+        let s = seed_first_run(&t.0);+        assert!(s.merged.is_empty() && s.skipped.contains(&"kicad_common.json".to_string()));+        assert_eq!(read_json(&f)["api"]["enable_server"], json!(false));+    }+     #[test]     fn seeds_only_absent_files() {         let t = tmp("seed");