aleleba/designcraft
1
0
Fork 0
mirror of https://github.com/storytold/designcraft.git synced 2026-10-24 10:16:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Place PDF: the page field takes one whole page number of 1 or more

Browse Source 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Brandon Thomas
2026-10-23 17:11:13 -04:00
co-authored by Claude Opus 5.5
parent d271298362
commit 0d139559bd
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/dialogs.rs
+18 -10
View File
@@ -3268,21 +3268,29 @@ pub fn confirm(app: &mut DesignApp) -> Result<Value, String> {
}
"pdfImport" => {
let crop = d.s("crop");
if !d.s("page").trim().is_empty() && d.n("page").is_none() {
// A range or list ("4-5", "2,5") is not a page number: refuse it rather than place page 1.
let e = "Enter a single page number; one page is placed at a time".to_string();
let mut d = d;
d.fields.insert("status".into(), json!(e));
app.ui.dialog = Some(d);
return Err(e);
}
// One page number, 1 or more; a blank field is page 1. A range or list ("4-5", "2,5"), a
// fraction or a negative is refused rather than placing some other page.
let raw = if d.fields.get("page").is_none_or(Value::is_null) { String::new() } else { d.s("page") };
let page = match raw.trim() {
"" => 1,
t => match t.parse::<u64>() {
Ok(n) if n >= 1 => n,
_ => {
let e = "Enter a single page number; one page is placed at a time".to_string();
let mut d = d;
d.fields.insert("status".into(), json!(e));
app.ui.dialog = Some(d);
return Err(e);
}
},
};
if d.b("async") {
return app.confirm_pdf_import(d.n("page").unwrap_or(1.0).max(1.0) as u64, if crop.is_empty() { "crop".into() } else { crop });
return app.confirm_pdf_import(page, if crop.is_empty() { "crop".into() } else { crop });
}
if let Some(target) = d.fields.get("target").and_then(Value::as_u64) {
app.activate_import_target(&crate::ImportRequest { purpose: "place".into(), target: Some(target) })?;
}
app.place_file(json!({"path": d.s("path"), "pdfPage": d.n("page").unwrap_or(1.0).max(1.0) as u64, "pdfCrop": if crop.is_empty() { "crop".to_string() } else { crop }}))
app.place_file(json!({"path": d.s("path"), "pdfPage": page, "pdfCrop": if crop.is_empty() { "crop".to_string() } else { crop }}))
}
"print" => {
let pages = if d.s("range") == "all" { Value::Null } else { json!(d.s("pages")) };
crates/ui-egui/src/lib.rs
+1 -1
View File
@@ -2953,7 +2953,7 @@ mod browser_import_tests {
#[test]
fn pdf_options_refuse_a_page_range_instead_of_placing_page_one() {
for spec in ["4-5", "2,5", "2-3"] {
for spec in ["4-5", "2,5", "2-3", "2.5", "-3", "0", "nan", "inf"] {
let mut app = app();
let request = app.import_request("place");
deliver(&mut app, request, "three.pdf", pdf());