Skip to content

VectorCraft: An open-source, vector art tool written by scratch in pure Rust

convert: attachment note from the export result's warnings, not a file scan

nrq6993-a11y1579b65b0709
diff --git a/apps/vectorcraft-cli/src/main.rs b/apps/vectorcraft-cli/src/main.rs
index 2425f5b4e..1f4c7e53e 100644
--- a/apps/vectorcraft-cli/src/main.rs
+++ b/apps/vectorcraft-cli/src/main.rs
@@ -104,8 +104,9 @@ USAGE:
--replace-lossy is given. --editing-data opens a .ai or an EPS with editing data from its editing copy
even where that draws differently from its PDF part or page (which can be older), as long as
it can be read. A PDF OUT omits the embedded native document unless --preserve-editing is
- given (the app's Save As PDF still defaults to keeping it). With --preserve-editing the
- result's warnings say the attachment was written.
+ given (the app's Save As PDF still defaults to keeping it). With --preserve-editing, when the
+ attachment is written the result's warnings say so (it is left out, with its own warning, for
+ --artboard or a --range without every artboard).
The result has the export's warnings, and importWarnings for what reading IN left out.
--ai-version 7 writes a .ai as the legacy version 7 (layers, groups and type kept; one file
per artboard, OUT-<artboard>.ai when there are several; default pdf, PDF-compatible), with
@@ -340,9 +341,10 @@ fn convert(args: &[String]) -> Result<(), String> {
&& vectorcraft_engine::cmd::fileio::format_for_name(&output).is_some_and(|f| f.id == "pdf")
&& let Some(obj) = r.as_object_mut()
{
- let path = obj.get("path").and_then(|p| p.as_str()).unwrap_or(&output);
- const ATTACHMENT: &str = "vectorcraft-editing.vectorcraft";
- let embedded = std::fs::read(path).is_ok_and(|bytes| bytes.windows(ATTACHMENT.len()).any(|w| w == ATTACHMENT.as_bytes()));
+ // The export leaves the attachment out (with this warning) for --artboard or a --range
+ // without every artboard; otherwise it writes it. Read that from the result, not the file.
+ let skipped = vectorcraft_engine::cmd::fileio::pdf::EDITING_NEEDS_EVERY_ARTBOARD;
+ let embedded = !obj.get("warnings").and_then(Value::as_array).is_some_and(|w| w.iter().any(|w| w.as_str() == Some(skipped)));
if embedded {
let note = "The PDF embeds the native VectorCraft document as an attachment (preserveEditing).";
if let Some(Value::Array(w)) = obj.get_mut("warnings") {
diff --git a/apps/vectorcraft-cli/tests/it/fileio.rs b/apps/vectorcraft-cli/tests/it/fileio.rs
index 22807b139..1423b78b4 100644
--- a/apps/vectorcraft-cli/tests/it/fileio.rs
+++ b/apps/vectorcraft-cli/tests/it/fileio.rs
@@ -60,6 +60,13 @@ fn convert_pdf_omits_editing_data_unless_preserve_editing() {
let bytes = std::fs::read(&kept).unwrap();
assert!(bytes.windows(b"vectorcraft-editing.vectorcraft".len()).any(|w| w == b"vectorcraft-editing.vectorcraft"), "{r}");
assert!(r["warnings"].as_array().is_some_and(|w| w.iter().any(|w| w.as_str().is_some_and(|s| s.contains("preserveEditing")))), "{r}");
+ // A --range without every artboard leaves the attachment out: no "embeds" note, even when the
+ // output's own name contains the attachment's name.
+ let part = tmp("vectorcraft-editing.vectorcraft.pdf");
+ let r: Value = serde_json::from_str(&ok(&["convert", &pdf, &part, "--preserve-editing", "--range", "2"])).unwrap();
+ let warnings = r["warnings"].as_array().cloned().unwrap_or_default();
+ assert!(warnings.iter().any(|w| w.as_str().is_some_and(|s| s.contains("every artboard"))), "{r}");
+ assert!(!warnings.iter().any(|w| w.as_str().is_some_and(|s| s.contains("preserveEditing"))), "{r}");
}
#[test]