shifathosn
/
cadcraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

properties.set rejects a linetype that is not loaded (#476) (#584) 

Squash of PR #584 by @MarekSpodBiedry.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
MarekSpodBiedry 2026-10-11 20:02:06 +02:00 committed by GitHub
parent 3f781c3395
commit f59b32cac7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
crates/engine/src/cmd/props.rs
View File

@ -184,6 +184,16 @@ fn run_set(s: &mut Session, p: &Value) -> Result<Value> {
.transpose()?;
let lw = p.get("lineweight").map(|v| super::layer::parse_lw(v).ok_or_else(|| bad("properties.set", "bad lineweight"))).transpose()?;
let d = s.doc_mut()?;
// An explicit object linetype must be ByLayer, ByBlock or a loaded definition (as `linetype current` requires).
let linetype = str_param(p, "linetype")
.map(|n| {
if n.eq_ignore_ascii_case("ByLayer") || n.eq_ignore_ascii_case("ByBlock") {
Ok(n.to_string())
} else {
d.linetype(n).map(|t| t.name.clone()).ok_or_else(|| bad("properties.set", format!("linetype `{n}` is not loaded")))
}
})
.transpose()?;
if let Some(l) = str_param(p, "layer") {
d.ensure_layer(l);
}
@ -203,8 +213,8 @@ fn run_set(s: &mut Session, p: &Value) -> Result<Value> {
if let Some(c) = color {
e.common.color = c;
}
if let Some(lt) = str_param(p, "linetype") {
e.common.linetype = lt.to_string();
if let Some(lt) = &linetype {
e.common.linetype.clone_from(lt);
}
if let Some(w) = lw {
e.common.lineweight = w;
@ -976,3 +986,26 @@ fn run_rename(s: &mut Session, p: &Value) -> Result<Value> {
}
ok()
}
#[cfg(test)]
mod tests {
use serde_json::json;
use crate::Session;
#[test]
fn properties_set_rejects_unloaded_linetype() {
let mut s = Session::new();
s.execute("linetype", &json!({ "load": "DASHED" })).unwrap();
s.execute("line", &json!({ "points": [[0, 0], [50, 0]] })).unwrap();
let h = s.doc().unwrap().model.last().unwrap().handle.hex();
s.execute("properties.set", &json!({ "handles": [h], "linetype": "DASHED" })).unwrap();
assert!(s.execute("properties.set", &json!({ "handles": [h], "linetype": "NOPE" })).is_err());
let lt = |s: &Session| s.doc().unwrap().model.last().unwrap().common.linetype.clone();
assert_eq!(lt(&s), "DASHED");
for ok in ["ByBlock", "ByLayer"] {
s.execute("properties.set", &json!({ "handles": [h], "linetype": ok })).unwrap();
assert_eq!(lt(&s), ok);
}
}
}