pycadkit 0.3.1__tar.gz → 0.3.2__tar.gz

{pycadkit-0.3.1 → pycadkit-0.3.2}/Cargo.lock

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

{pycadkit-0.3.1 → pycadkit-0.3.2}/Cargo.toml

@@ -4,7 +4,7 @@ members = ["crates/*"]
 exclude = ["fuzz"]
 
 [workspace.package]
-version = "0.3.1"
+version = "0.3.2"
 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.1" }
-cadkit-dgn = { path = "crates/cadkit-dgn", version = "0.3.1" }
-cadkit-dwg = { path = "crates/cadkit-dwg", version = "0.3.1" }
-cadkit-dxf = { path = "crates/cadkit-dxf", version = "0.3.1" }
-cadkit-gml = { path = "crates/cadkit-gml", version = "0.3.1" }
-cadkit = { path = "crates/cadkit", version = "0.3.1" }
+cadkit-core = { path = "crates/cadkit-core", version = "0.3.2" }
+cadkit-dgn = { path = "crates/cadkit-dgn", version = "0.3.2" }
+cadkit-dwg = { path = "crates/cadkit-dwg", version = "0.3.2" }
+cadkit-dxf = { path = "crates/cadkit-dxf", version = "0.3.2" }
+cadkit-gml = { path = "crates/cadkit-gml", version = "0.3.2" }
+cadkit = { path = "crates/cadkit", version = "0.3.2" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 thiserror = "2"

{pycadkit-0.3.1 → pycadkit-0.3.2}/PKG-INFO

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

{pycadkit-0.3.1 → pycadkit-0.3.2}/crates/cadkit-dgn/src/writer/tables.rs

@@ -42,12 +42,50 @@ impl Tables {
             changed_sets: BTreeMap::new(),
         };
         let mut level_names = HashSet::new();
-        for raw in records {
-            let e = decode_v8::decode(
-                &raw,
+        let read_record = |raw: &RawElement| {
+            decode_v8::decode(
+                raw,
                 crate::text::encoding_for(read.fallback_codepage.as_deref()),
                 &read.limits,
-            );
+            )
+        };
+        let records: Vec<RawElement> = records.collect();
+        // Some seeds (files a 3D post-processor touched) carry a second level table
+        // whose codes repeat codes of the first one. Elements store the code only, so
+        // a repeated code makes readers show new elements on the other table's level.
+        // Later definitions of a code move to free codes after the highest one, and the
+        // extra table headers are dropped: the output has one table with unique codes.
+        let mut free_level = records
+            .iter()
+            .filter_map(|raw| match read_record(raw).data {
+                ElementData::Level(level) => Some(level.id),
+                _ => None,
+            })
+            .max()
+            .unwrap_or(0);
+        let mut level_codes = HashSet::new();
+        let mut level_header = false;
+        for mut raw in records {
+            let is_level_header = crate::le::u32_at(&raw.bytes, 0).map(|v| v & 0xffff) == Some(96)
+                && crate::le::u32_at(&raw.bytes, 12) == Some(1);
+            if is_level_header {
+                if level_header {
+                    continue;
+                }
+                level_header = true;
+            }
+            let mut e = read_record(&raw);
+            if let ElementData::Level(level) = &mut e.data
+                && !level_codes.insert(level.id)
+                && crate::le::u32_at(&raw.bytes, 0x20) == Some(level.id)
+            {
+                free_level = free_level
+                    .checked_add(1)
+                    .ok_or_else(|| Error::LimitExceeded("DGN levels".into()))?;
+                u32_at(&mut raw.bytes, 0x20, free_level)?;
+                level.id = free_level;
+                level_codes.insert(free_level);
+            }
             match e.data {
                 ElementData::Font { number, name } => {
                     out.fonts.insert(name, number);

{pycadkit-0.3.1 → pycadkit-0.3.2}/crates/cadkit-dgn/src/writer/tests/regressions.rs

@@ -297,3 +297,91 @@ fn literal_names_cannot_collide_with_generated_level_aliases() {
         (2, Some("Shared")),
     ]);
 }
+
+/// A seed whose second level table (as left by a 3D post-processor) repeats the codes of
+/// the first one: elements written on a first-table level must read back on that level.
+#[test]
+fn a_second_level_table_with_repeated_codes_cannot_capture_new_elements() {
+    let level = |id: u64, code: u32, name: &str| {
+        let mut b = prefix(95, 0x30, id, 1, 0.).unwrap();
+        u32_at(&mut b, 0x20, code).unwrap();
+        u32_at(&mut b, 0x24, u32::MAX).unwrap();
+        finish(b, &string_link(1, name).unwrap()).unwrap()
+    };
+    let header = |id: u64, count: u32| {
+        let mut b = prefix(96, 0x28, id, 1, 0.).unwrap();
+        u32_at(&mut b, 0x20, count).unwrap();
+        finish(b, &[]).unwrap()
+    };
+    let first = vec![
+        header(90, 3),
+        level(100, 1, "Frame"),
+        level(101, 2, "Area"),
+        level(102, 64, "Default"),
+    ];
+    let second = vec![
+        header(200, 2),
+        level(201, 1, "Temp"),
+        level(202, 2, "Surface"),
+    ];
+    let mut file = ::cfb::CompoundFile::open(Cursor::new(seed(false))).unwrap();
+    file.create_storage_all("Dgn^Nm").unwrap();
+    for (path, records) in [("Dgn^Nm/$1", &first), ("Dgn^Nm/$2", &second)] {
+        file.create_stream(path)
+            .unwrap()
+            .write_all(&page(records, 3, 1).unwrap())
+            .unwrap();
+    }
+    file.flush().unwrap();
+    let seed = file.into_inner().into_inner();
+
+    let mut doc = crate::read(&seed, &ReadOptions::default()).unwrap();
+    doc.models[0].entities = ["Frame", "Area"]
+        .into_iter()
+        .map(|name| {
+            let mut entity = line();
+            entity.layer = Some(name.into());
+            entity
+        })
+        .collect();
+    let bytes = write_v8(&doc, &seed, &WriteOptions::default()).unwrap();
+    let parsed = crate::read(&bytes, &ReadOptions::default()).unwrap();
+    let layers: Vec<_> = parsed.models[0]
+        .entities
+        .iter()
+        .map(|e| e.layer.clone().unwrap())
+        .collect();
+    assert_eq!(layers, ["Frame", "Area"]);
+
+    let native = v8::read(&bytes, &ReadOptions::default()).unwrap();
+    let records: Vec<_> = native
+        .named_pages
+        .iter()
+        .flat_map(|p| &p.elements)
+        .collect();
+    let headers: Vec<_> = records
+        .iter()
+        .filter(|e| {
+            crate::le::u32_at(&e.bytes, 0).map(|n| n & 0xffff) == Some(96)
+                && crate::le::u32_at(&e.bytes, 12) == Some(1)
+        })
+        .collect();
+    assert_eq!(headers.len(), 1, "one level table");
+    let codes: Vec<_> = records
+        .iter()
+        .filter(|e| e.type_code() == 95 && crate::le::u32_at(&e.bytes, 12) == Some(1))
+        .filter_map(|e| crate::le::u32_at(&e.bytes, 0x20))
+        .collect();
+    let unique: BTreeSet<_> = codes.iter().collect();
+    assert_eq!(
+        unique.len(),
+        codes.len(),
+        "level codes are unique: {codes:?}"
+    );
+    assert_eq!(
+        crate::le::u32_at(&headers[0].bytes, 0x20),
+        Some(codes.len() as u32)
+    );
+    // The second table's levels are kept under fresh codes.
+    assert!(parsed.layers.iter().any(|l| l.name.starts_with("Temp")));
+}