pycadkit 0.3.3__tar.gz → 0.3.4__tar.gz

{pycadkit-0.3.3 → pycadkit-0.3.4}/Cargo.lock

@@ -66,7 +66,7 @@ checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
 [[package]]
 name = "cadkit"
-version = "0.3.3"
+version = "0.3.4"
 dependencies = [
  "cadkit-core",
  "cadkit-dgn",
@@ -78,7 +78,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-capi"
-version = "0.3.3"
+version = "0.3.4"
 dependencies = [
  "cadkit",
  "serde",
@@ -87,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-cli"
-version = "0.3.3"
+version = "0.3.4"
 dependencies = [
  "cadkit",
  "clap",
@@ -96,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-core"
-version = "0.3.3"
+version = "0.3.4"
 dependencies = [
  "serde",
  "serde_json",
@@ -105,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-dgn"
-version = "0.3.3"
+version = "0.3.4"
 dependencies = [
  "cadkit-core",
  "cfb",
@@ -116,7 +116,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-dwg"
-version = "0.3.3"
+version = "0.3.4"
 dependencies = [
  "cadkit-core",
  "cadkit-dxf",
@@ -126,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-dxf"
-version = "0.3.3"
+version = "0.3.4"
 dependencies = [
  "cadkit-core",
  "encoding_rs",
@@ -135,7 +135,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-gml"
-version = "0.3.3"
+version = "0.3.4"
 dependencies = [
  "cadkit-core",
  "quick-xml",
@@ -145,7 +145,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-py"
-version = "0.3.3"
+version = "0.3.4"
 dependencies = [
  "cadkit",
  "pyo3",
@@ -155,7 +155,7 @@ dependencies = [
 
 [[package]]
 name = "cadkit-wasm"
-version = "0.3.3"
+version = "0.3.4"
 dependencies = [
  "cadkit",
  "js-sys",

{pycadkit-0.3.3 → pycadkit-0.3.4}/Cargo.toml

@@ -4,7 +4,7 @@ members = ["crates/*"]
 exclude = ["fuzz"]
 
 [workspace.package]
-version = "0.3.3"
+version = "0.3.4"
 edition = "2024"
 rust-version = "1.85"
 license = "MIT OR Apache-2.0"
@@ -14,12 +14,12 @@ keywords = ["cad", "dwg", "dgn", "dxf", "citygml"]
 categories = ["parser-implementations", "graphics", "encoding", "science::geo"]
 
 [workspace.dependencies]
-cadkit-core = { path = "crates/cadkit-core", version = "0.3.3" }
-cadkit-dgn = { path = "crates/cadkit-dgn", version = "0.3.3" }
-cadkit-dwg = { path = "crates/cadkit-dwg", version = "0.3.3" }
-cadkit-dxf = { path = "crates/cadkit-dxf", version = "0.3.3" }
-cadkit-gml = { path = "crates/cadkit-gml", version = "0.3.3" }
-cadkit = { path = "crates/cadkit", version = "0.3.3" }
+cadkit-core = { path = "crates/cadkit-core", version = "0.3.4" }
+cadkit-dgn = { path = "crates/cadkit-dgn", version = "0.3.4" }
+cadkit-dwg = { path = "crates/cadkit-dwg", version = "0.3.4" }
+cadkit-dxf = { path = "crates/cadkit-dxf", version = "0.3.4" }
+cadkit-gml = { path = "crates/cadkit-gml", version = "0.3.4" }
+cadkit = { path = "crates/cadkit", version = "0.3.4" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 thiserror = "2"

{pycadkit-0.3.3 → pycadkit-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycadkit
-Version: 0.3.3
+Version: 0.3.4
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research

{pycadkit-0.3.3 → pycadkit-0.3.4}/crates/cadkit-dgn/src/native/decode_v8.rs

@@ -136,9 +136,10 @@ pub fn decode(raw: &RawElement, enc: &'static Encoding, limits: &Limits) -> Elem
         35 => d.cell().map(ElementData::SharedCellInstance),
         37 => d.tag(&linkages).map(ElementData::Tag),
         39 => d.tag_set(&linkages).map(ElementData::TagSet),
+        // An attachment written with a relative path stores an empty full path.
         90 => Ok(ElementData::RasterReference {
-            file_name: linkage::string(&linkages, 3),
-            full_path: linkage::string(&linkages, 0x1f),
+            file_name: linkage::string(&linkages, 3).filter(|s| !s.is_empty()),
+            full_path: linkage::string(&linkages, 0x1f).filter(|s| !s.is_empty()),
         }),
         94 => le::f64s::<16>(d.b, 0x78)
             .map(|matrix| ElementData::RasterFrame {

{pycadkit-0.3.3 → pycadkit-0.3.4}/crates/cadkit-dgn/src/writer/raster_template.rs

@@ -168,7 +168,7 @@ impl Template {
         let (Some(path), Some(size)) = (path, size_px) else {
             return Err(Error::Unsupported(NEEDS_PATH_AND_SIZE.into()));
         };
-        let url = file_url(path)?;
+        let url = full_path(path)?;
         let name = file_name(e, path)?;
         let p = Placement::new(*position, *u_vector, *v_vector, *size, model)?;
         let dpi = self.dpi(e)?;
@@ -388,9 +388,11 @@ impl XAttribute {
             off = start.checked_add(len)?;
         }
         let trailer = payload.get(off..)?.to_vec();
-        // Sub-records 3 and 4 must hold exactly one string, which is what gets replaced.
+        // Sub-records 3 and 4 must hold exactly one string, which is what gets replaced; the
+        // full path in 4 is empty in attachments written with a relative path.
         let single = |i: usize| subs.get(i).and_then(|(_, d)| utf16z_text(d));
-        if trailer.len() > 16 || single(3).is_none() || single(4).is_none() {
+        let empty = subs.get(4).is_some_and(|(_, d)| d.as_slice() == [0, 0]);
+        if trailer.len() > 16 || single(3).is_none() || (single(4).is_none() && !empty) {
             return None;
         }
         Some(Self {
@@ -466,10 +468,14 @@ fn identity(b: &mut [u8], id: u64, time: f64) -> Result<()> {
     f64_at(b, 0x18, time)
 }
 
-/// The stored URL: the path as given when it is already a `file://` URL, else `file://`
-/// followed by the path. The path must be absolute (a drive, UNC or rooted path): the
-/// attachments carry no relative paths.
-fn file_url(path: &str) -> Result<String> {
+/// The stored full path (string linkage `0x1F`, XAttribute sub-record 4).
+///
+/// An absolute path (a drive, UNC or rooted path) is stored as a `file://` URL, as every
+/// observed attachment stores it; a path that already is one is kept. A relative path
+/// names a file beside the DGN, so the attachment carries no machine-specific location:
+/// a bare file name stores an empty full path, `.\name` (or `./name`) is stored as given.
+/// Relative paths into other folders are refused.
+fn full_path(path: &str) -> Result<String> {
     let has_scheme = path
         .get(..7)
         .is_some_and(|s| s.eq_ignore_ascii_case("file://"));
@@ -478,17 +484,35 @@ fn file_url(path: &str) -> Result<String> {
     } else {
         path
     };
+    if local.contains('\0') {
+        return Err(Error::invalid(0, "DGN raster path contains NUL"));
+    }
     let bytes = local.as_bytes();
     let drive = matches!(bytes, [d, b':', b'\\' | b'/', ..] if d.is_ascii_alphabetic());
-    if local.contains('\0') || !(drive || local.starts_with('\\') || local.starts_with('/')) {
+    if drive || local.starts_with('\\') || local.starts_with('/') {
+        return Ok(if has_scheme {
+            path.to_owned()
+        } else {
+            format!("file://{path}")
+        });
+    }
+    let name = local
+        .strip_prefix(".\\")
+        .or_else(|| local.strip_prefix("./"))
+        .unwrap_or(local);
+    if has_scheme
+        || name.is_empty()
+        || name.contains(['\\', '/', ':'])
+        || matches!(name, "." | "..")
+    {
         return Err(Error::Unsupported(
-            "DGN raster path must be absolute".into(),
+            "DGN raster path must be absolute or name a file beside the DGN".into(),
         ));
     }
-    Ok(if has_scheme {
-        path.to_owned()
+    Ok(if name.len() == local.len() {
+        String::new()
     } else {
-        format!("file://{path}")
+        local.to_owned()
     })
 }
 

{pycadkit-0.3.3 → pycadkit-0.3.4}/crates/cadkit-dgn/src/writer/tests/raster_template.rs

@@ -622,7 +622,10 @@ fn invalid_attachments_are_reported() {
             no_size,
             Some("new DGN raster attachments need path and size_px"),
         ),
-        (relative, Some("DGN raster path must be absolute")),
+        (
+            relative,
+            Some("DGN raster path must be absolute or name a file beside the DGN"),
+        ),
         (parallel, None),
         (lifted, Some("nonzero Z cannot be written into a 2D seed")),
     ] {
@@ -647,6 +650,119 @@ fn invalid_attachments_are_reported() {
     ));
 }
 
+/// A relative path names a file beside the DGN: the name is stored and the full path is
+/// empty for a bare name and kept as given for `.\name`, so the file carries no
+/// machine-specific location. The output's groups serve as a template again.
+#[test]
+fn relative_paths_store_no_machine_location() {
+    let read = ReadOptions::default();
+    for (seed, three) in [(template_seed(false), false), (seed(true), true)] {
+        let mut written = attachments();
+        let paths = ["sheet.tif", "sheet.tif", ".\\other.tif", "kat planı.tif"];
+        for (e, p) in written.iter_mut().zip(paths) {
+            if let EntityKind::Image { path, .. } = &mut e.kind {
+                *path = Some(p.into());
+            }
+        }
+        let output = write_v8(&document(three, written), &seed, &clear()).unwrap();
+        let native = v8::read(&output, &read).unwrap();
+        let references: Vec<(String, String)> = native.models[0]
+            .control_pages
+            .iter()
+            .flat_map(|p| &p.elements)
+            .filter(|r| r.type_code() == 90)
+            .map(|r| {
+                let links = linkage::parse(
+                    r.attributes(),
+                    r.attribute_offset(),
+                    true,
+                    encoding_rs::UTF_8,
+                );
+                let text = |id: u32| {
+                    links
+                        .iter()
+                        .find_map(|l| match &l.data {
+                            LinkageData::String {
+                                string_id, text, ..
+                            } if *string_id == id => Some(text.clone()),
+                            _ => None,
+                        })
+                        .unwrap()
+                };
+                (text(3), text(0x1f))
+            })
+            .collect();
+        let want = [
+            ("sheet.tif", ""),
+            ("sheet.tif", ""),
+            ("other.tif", ".\\other.tif"),
+            ("kat planı.tif", ""),
+        ];
+        assert_eq!(references, want.map(|(n, f)| (n.to_owned(), f.to_owned())));
+        let payloads: Vec<Vec<u8>> = native.models[0]
+            .graphic_aux
+            .iter()
+            .flat_map(|p| &p.records)
+            .filter(|a| a.kind == 170)
+            .map(|a| a.payload.clone())
+            .collect();
+        assert_eq!(payloads.len(), 4);
+        for (payload, (name, full)) in payloads.iter().zip(want) {
+            let has = |s: &str| payload.windows(utf16z(s).len()).any(|w| w == utf16z(s));
+            assert!(has(name));
+            assert!(full.is_empty() || has(full));
+            assert!(!has("file://"));
+        }
+        // Read back: the path is the stored full path, else the name; no raster warning.
+        let reread = crate::read(&output, &read).unwrap();
+        assert!(
+            reread
+                .warnings
+                .iter()
+                .all(|w| !w.code.starts_with("dgn.raster")),
+            "{:?}",
+            reread.warnings
+        );
+        let got: Vec<(Option<String>, Option<String>)> = reread.models[0]
+            .entities
+            .iter()
+            .map(|e| match &e.kind {
+                EntityKind::Image { path, .. } => (path.clone(), text(e, "dgn.raster_path")),
+                other => panic!("{other:?}"),
+            })
+            .collect();
+        assert_eq!(
+            got,
+            [
+                (Some("sheet.tif".into()), None),
+                (Some("sheet.tif".into()), None),
+                (Some(".\\other.tif".into()), Some(".\\other.tif".into())),
+                (Some("kat planı.tif".into()), None),
+            ]
+        );
+        assert!(crate::seed_has_raster_template(&output, &read).unwrap());
+    }
+    for bad in [
+        "plans\\sheet.tif",
+        "..\\sheet.tif",
+        "file://sheet.tif",
+        ".\\",
+        "..",
+    ] {
+        let mut e = attachments().remove(0);
+        if let EntityKind::Image { path, .. } = &mut e.kind {
+            *path = Some(bad.into());
+        }
+        assert!(
+            matches!(
+                write_v8(&document(false, vec![e]), &template_seed(false), &clear()),
+                Err(Error::Unsupported(_))
+            ),
+            "{bad}"
+        );
+    }
+}
+
 #[test]
 fn incomplete_groups_are_not_templates() {
     // The seed of the preservation tests holds a 90, 92 and one 91 but no full group.