VectorCraft: An open-source, vector art tool written by scratch in pure Rust
Actions: the saved current set follows its set when windows merge
dotCooCoo90179904d827
diff --git a/apps/vectorcraft/src/prefs.rs b/apps/vectorcraft/src/prefs.rsindex 728fe9ba8..cf4e59b28 100644--- a/apps/vectorcraft/src/prefs.rs+++ b/apps/vectorcraft/src/prefs.rs@@ -171,6 +171,11 @@ fn merge_changes(base: &serde_json::Value, mine: &serde_json::Value, on_disk: selet (Some(base), Some(mine), Value::Object(mut out)) = (base.as_object(), mine.as_object(), on_disk) else {return mine.clone();};+ // The current Actions set (`action_set`, an index) is this window's when this window chose+ // another one or the other window did not; otherwise it is the other window's.+ let use_mine = chose_another_action_set(base, mine) || !chose_another_action_set(base, &out);+ // The list the saved current set was chosen from.+ let chosen_from = if use_mine { mine.get("action_sets").cloned() } else { out.get("action_sets").cloned() };let keys: std::collections::BTreeSet<&String> = base.keys().chain(mine.keys()).collect();for key in keys {if PASSING.contains(&key.as_str()) {@@ -180,7 +185,7 @@ fn merge_changes(base: &serde_json::Value, mine: &serde_json::Value, on_disk: secontinue;}let (was, now) = (base.get(key), mine.get(key));- if was == now {+ if was == now || key == "action_set" {continue;}if key == "engine_prefs"@@ -209,9 +214,95 @@ fn merge_changes(base: &serde_json::Value, mine: &serde_json::Value, on_disk: se}}}+ if use_mine {+ match mine.get("action_set") {+ Some(v) => {+ out.insert("action_set".to_string(), v.clone());+ }+ None => {+ out.remove("action_set");+ }+ }+ }+ keep_current_action_set(&mut out, chosen_from.as_ref());Value::Object(out)}+/// Point the saved current Actions set (`action_set`) at the same set in the merged+/// `action_sets` when the merge took the index from one window and the list from another+/// ([`find_action_set`]). With no such set, no set is current.+fn keep_current_action_set(out: &mut serde_json::Map<String, serde_json::Value>, chosen_from: Option<&serde_json::Value>) {+ use serde_json::Value;+ let Some(i) = out.get("action_set").and_then(Value::as_u64).and_then(|i| usize::try_from(i).ok()) else { return };+ let merged = out.get("action_sets");+ if merged == chosen_from {+ return;+ }+ match find_action_set(chosen_from, i, merged) {+ Some(j) => {+ out.insert("action_set".to_string(), Value::from(j));+ }+ None => {+ out.remove("action_set");+ }+ }+}++/// Was another Actions set made current from `base` to `now`? Recording into the current set,+/// renaming it, deleting it, or deleting a set before it changes the list or the index without+/// choosing another set.+fn chose_another_action_set(base: &serde_json::Map<String, serde_json::Value>, now: &serde_json::Map<String, serde_json::Value>) -> bool {+ use serde_json::Value;+ let index = |v: &serde_json::Map<String, Value>| v.get("action_set").and_then(Value::as_u64).and_then(|i| usize::try_from(i).ok());+ let (was, sets) = (base.get("action_sets"), now.get("action_sets"));+ let (Some(i), Some(k)) = (index(base), index(now)) else {+ return match (index(base), index(now)) {+ (None, None) => false,+ // No set is current: another set was chosen only if the current one is still there.+ (Some(i), None) => find_action_set(was, i, sets).is_some(),+ _ => true,+ };+ };+ if was == sets {+ return i != k;+ }+ if let Some(j) = find_action_set(was, i, sets) {+ return j != k;+ }+ // The set at the same place changed while every other set stayed as it was: it was edited.+ let edited_in_place = was+ .and_then(Value::as_array)+ .zip(sets.and_then(Value::as_array))+ .is_some_and(|(was, sets)| was.len() == sets.len() && was.iter().zip(sets).enumerate().all(|(j, (a, b))| j == i || a == b));+ !(i == k && edited_in_place)+}++/// Where the Actions set at index `i` of `old` is in `new` (two `action_sets` lists): found by+/// its contents when no other set in either list has the same contents, otherwise by its name when+/// no other set in either list has it.+fn find_action_set(old: Option<&serde_json::Value>, i: usize, new: Option<&serde_json::Value>) -> Option<usize> {+ use serde_json::Value;+ let (old, new) = (old?.as_array()?, new?.as_array()?);+ let set = old.get(i)?;+ let only = |list: &[Value], same: &dyn Fn(&Value) -> bool| {+ let mut found = list.iter().enumerate().filter(|(_, s)| same(s));+ match (found.next(), found.next()) {+ (Some((j, _)), None) => Some(j),+ _ => None,+ }+ };+ let same_contents = |s: &Value| s == set;+ if only(old, &same_contents).is_some()+ && let Some(j) = only(new, &same_contents)+ {+ return Some(j);+ }+ let name = set.get("name")?;+ let same_name = |s: &Value| s.get("name") == Some(name);+ only(old, &same_name)?;+ only(new, &same_name)+}+/// The preferences file's contents: the UI state with the engine preferences.#[cfg(test)]pub(crate) fn prefs_bytes(app: &VectorcraftApp) -> serde_json::Result<Vec<u8>> {@@ -274,6 +365,112 @@ mod tests {assert!(!same_lasting(&base, &mine));}+ /// One window deleted the first Actions set and saved; this one made the second set current.+ /// The saved index follows that set to its place in the merged list.+ #[test]+ fn the_current_action_set_follows_its_set_in_the_merged_list() {+ let set = |name: &str| json!({"name": name, "actions": []});+ let base = json!({"action_sets": [set("A"), set("B"), set("C")], "action_set": 0});+ let on_disk = json!({"action_sets": [set("B"), set("C")]});+ let mine = json!({"action_sets": [set("A"), set("B"), set("C")], "action_set": 1});+ assert_eq!(merge_changes(&base, &mine, on_disk), json!({"action_sets": [set("B"), set("C")], "action_set": 0}));+ // The other window also recorded into B: B is found by its name.+ let on_disk = json!({"action_sets": [{"name": "B", "actions": [{"name": "Action 1", "steps": []}]}, set("C")]});+ let merged = merge_changes(&base, &mine, on_disk);+ assert_eq!(merged["action_set"], json!(0));+ // The other window deleted B: no set is current.+ let on_disk = json!({"action_sets": [set("A"), set("C")]});+ assert_eq!(merge_changes(&base, &mine, on_disk), json!({"action_sets": [set("A"), set("C")]}));+ }++ /// This window deleted the first set while the index saved by the other window still stands.+ #[test]+ fn the_other_windows_current_action_set_follows_its_set() {+ let set = |name: &str| json!({"name": name, "actions": []});+ let base = json!({"action_sets": [set("A"), set("B"), set("C")]});+ let on_disk = json!({"action_sets": [set("A"), set("B"), set("C")], "action_set": 2});+ let mine = json!({"action_sets": [set("B"), set("C")]});+ assert_eq!(merge_changes(&base, &mine, on_disk), json!({"action_sets": [set("B"), set("C")], "action_set": 1}));+ }++ /// The other window replaced or renamed the set this one made current (the saved sets do not+ /// tell the two apart): no set is current.+ #[test]+ fn a_set_in_the_place_of_the_current_set_is_not_made_current() {+ let set = |name: &str| json!({"name": name, "actions": []});+ let base = json!({"action_sets": [set("A"), set("B"), set("C")]});+ let on_disk = json!({"action_sets": [set("A"), set("D"), set("C")]});+ let mine = json!({"action_sets": [set("A"), set("B"), set("C")], "action_set": 1});+ assert_eq!(merge_changes(&base, &mine, on_disk).get("action_set"), None);+ let on_disk = json!({"action_sets": [set("A"), set("C"), set("D")]});+ assert_eq!(merge_changes(&base, &mine, on_disk).get("action_set"), None);+ }++ /// This window deleted a set and made the set now at the old index current: its choice is+ /// saved, though the index is the same number.+ #[test]+ fn a_new_current_set_at_the_same_index_is_saved() {+ let set = |name: &str| json!({"name": name, "actions": []});+ let base = json!({"action_sets": [set("A"), set("B"), set("C")], "action_set": 1});+ let on_disk = json!({"action_sets": [{"name": "A", "actions": [{"name": "Action 1", "steps": []}]}, set("B"), set("C")], "action_set": 1});+ let mine = json!({"action_sets": [set("B"), set("C")], "action_set": 1});+ assert_eq!(merge_changes(&base, &mine, on_disk), json!({"action_sets": [set("B"), set("C")], "action_set": 1}));+ }++ /// Recording into the current set does not choose it again: the other window's choice stays.+ #[test]+ fn recording_into_the_current_set_keeps_the_other_windows_choice() {+ let set = |name: &str| json!({"name": name, "actions": []});+ let recorded = json!({"name": "A", "actions": [{"name": "Action 1", "steps": []}]});+ let base = json!({"action_sets": [set("A"), set("B"), set("C")], "action_set": 0});+ let on_disk = json!({"action_sets": [set("A"), set("B"), set("C")], "action_set": 2});+ let mine = json!({"action_sets": [recorded.clone(), set("B"), set("C")], "action_set": 0});+ assert_eq!(merge_changes(&base, &mine, on_disk), json!({"action_sets": [recorded, set("B"), set("C")], "action_set": 2}));+ }++ /// Renaming the current set does not choose it again: the other window's choice stays. With no+ /// other choice, the renamed set stays current.+ #[test]+ fn renaming_the_current_set_keeps_the_other_windows_choice() {+ let set = |name: &str| json!({"name": name, "actions": []});+ let base = json!({"action_sets": [set("A"), set("B"), set("C")], "action_set": 0});+ let on_disk = json!({"action_sets": [set("A"), set("B"), set("C")], "action_set": 1});+ let mine = json!({"action_sets": [set("A2"), set("B"), set("C")], "action_set": 0});+ assert_eq!(merge_changes(&base, &mine, on_disk)["action_set"], json!(1));+ assert_eq!(merge_changes(&base, &mine, base.clone())["action_set"], json!(0));+ }++ /// Deleting the current set does not override the other window's choice.+ #[test]+ fn deleting_the_current_set_keeps_the_other_windows_choice() {+ let set = |name: &str| json!({"name": name, "actions": []});+ let base = json!({"action_sets": [set("A"), set("B")], "action_set": 0});+ let on_disk = json!({"action_sets": [set("A"), set("B")], "action_set": 1});+ let mine = json!({"action_sets": [set("B")]});+ assert_eq!(merge_changes(&base, &mine, on_disk), json!({"action_sets": [set("B")], "action_set": 0}));+ assert_eq!(merge_changes(&base, &mine, base.clone()), json!({"action_sets": [set("B")]}));+ }++ /// Deleting a set before the current one moves its index without choosing it again.+ #[test]+ fn deleting_a_set_before_the_current_one_keeps_it_current() {+ let set = |name: &str| json!({"name": name, "actions": []});+ let base = json!({"action_sets": [set("A"), set("B"), set("C")], "action_set": 2});+ let mine = json!({"action_sets": [set("B"), set("C")], "action_set": 1});+ assert_eq!(merge_changes(&base, &mine, base.clone()), json!({"action_sets": [set("B"), set("C")], "action_set": 1}));+ }++ /// Two sets with the same contents: when the other window deleted the one this window made+ /// current, the one left is not made current in its place.+ #[test]+ fn a_set_with_the_same_contents_does_not_take_the_place_of_the_current_set() {+ let set = |name: &str| json!({"name": name, "actions": []});+ let base = json!({"action_sets": [set("A"), set("A"), set("C")]});+ let on_disk = json!({"action_sets": [set("A"), set("C")]});+ let mine = json!({"action_sets": [set("A"), set("A"), set("C")], "action_set": 1});+ assert_eq!(merge_changes(&base, &mine, on_disk), json!({"action_sets": [set("A"), set("C")]}));+ }+#[test]fn a_file_that_is_not_an_object_is_replaced() {let base = json!({"workspace": "Essentials"});