pauljd/vectorcraft
1
0
Fork 0
mirror of https://github.com/storytold/vectorcraft.git synced 2026-11-09 11:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Variables: an import or library load that changes nothing adds no undo step

Browse Source 
dataset.import and variable.loadLibrary added an undo step, cleared Redo
and marked a saved document modified even when the variables and data
sets came out as they were, such as the same CSV or library loaded
again. Both now build the new variables on a copy and record a step only
when it differs. variable.loadLibrary's params text and docs/mcp.md say
so.
This commit is contained in:
dotCooCoo
2026-11-02 12:03:45 +07:00
committed by bflatastic
parent d0749dde41
commit a6ce22da5c
5 changed files with 89 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/engine/src/cmd/variablecmds/csv.rs
+19 -14
View File
@@ -324,21 +324,26 @@ pub(super) fn dataset_import(s: &mut Session, p: &Value) -> Result<Value> {
}
let names: Vec<String> = parsed.iter().map(|d| d.name.clone()).collect();
let new_variables: Vec<String> = defined.iter().map(|v| v.name.clone()).collect();
let (imported, updated) = s.edit("Import Data Sets", |d, _| {
d.variables.variables.extend(defined);
let mut imported = 0usize;
let mut updated = 0usize;
for row in parsed {
if let Some(existing) = d.variables.datasets.iter_mut().find(|x| x.name == row.name) {
*existing = row;
updated += 1;
} else {
d.variables.datasets.push(row);
imported += 1;
}
let mut vars = s.doc()?.doc.variables.clone();
vars.variables.extend(defined);
let (mut imported, mut updated) = (0usize, 0usize);
for row in parsed {
if let Some(existing) = vars.datasets.iter_mut().find(|x| x.name == row.name) {
*existing = row;
updated += 1;
} else {
vars.datasets.push(row);
imported += 1;
}
Ok((imported, updated))
})?;
}
// The import is one undo step, and an import that leaves the variables and data sets as they
// were adds none.
if vars != s.doc()?.doc.variables {
s.edit("Import Data Sets", |d, _| {
d.variables = vars;
Ok(())
})?;
}
Ok(json!({"imported": imported, "updated": updated, "names": names, "defined": new_variables}))
}
crates/engine/src/cmd/variablecmds/library.rs
+14 -8
View File
@@ -249,7 +249,8 @@ fn parse_library(xml: &str, cmd: &str) -> Result<Library> {
}
/// Load Variable Library: replace the document's variables and data sets with a variable library's
/// ([`parse_library`]) in one undo step. Every variable of the document is deleted with its bindings
/// ([`parse_library`]) in one undo step, or none when the document already holds what the library
/// gives. Every variable of the document is deleted with its bindings
/// and values, and every data set is deleted. The library's text variables are then defined,
/// unbound, and its data sets are added. The library's variables of other kinds are left out, named
/// in `skipped` and in a warning.
@@ -268,13 +269,18 @@ pub(super) fn load_library(s: &mut Session, p: &Value) -> Result<Value> {
}
let added: Vec<Variable> = lib.text.iter().map(|n| Variable { name: n.clone(), kind: VariableKind::Text }).collect();
let names: Vec<String> = lib.datasets.iter().map(|d| d.name.clone()).collect();
s.edit("Load Variable Library", |d, _| {
d.variables.prune(&deleted);
d.variables.variables.extend(added);
d.variables.datasets = lib.datasets;
d.variables.active_dataset = None;
Ok(())
})?;
let mut vars = s.doc()?.doc.variables.clone();
vars.prune(&deleted);
vars.variables.extend(added);
vars.datasets = lib.datasets;
vars.active_dataset = None;
// A load that leaves the variables and data sets as they were adds no undo step.
if vars != s.doc()?.doc.variables {
s.edit("Load Variable Library", |d, _| {
d.variables = vars;
Ok(())
})?;
}
// A highlight of a variable that is gone highlights nothing.
let st = s.doc_mut()?;
st.drop_stale_variables_highlight();