PdfCraft: An open-source PDF reader and editor written by scratch in pure Rust
Merge PR #3849: cli: the argument bugs photocraft#7071 lists are live here too
aiongg66c8db07a01d
diff --cc apps/pdfcraft-cli/src/main.rsindex d0f23242d,3fd67e3bb..cfbf43270--- a/apps/pdfcraft-cli/src/main.rs+++ b/apps/pdfcraft-cli/src/main.rs@@@ -301,12 -350,10 +355,12 @@@ fn read(path: &str) -> Result<Arc<Vec<ufn info(args: &[String]) -> Result<(), CliError> {validate_options("info", args, INFO_OPTIONS)?;- let path = *positional(args).first().ok_or("info: missing file")?;+ let path = *positional(args, INFO_OPTIONS).first().ok_or("info: missing file")?;let bytes = read(path)?;let password = flag(args, "--password");- let mut info = inspect(bytes.clone(), password).map_err(|e| e.to_string())?;+ // The renderer takes only the user password of R2–R4 files; `Session::open` takes either.+ let render_password = pdfcraft_engine::render_password_for(bytes.clone(), password);+ let mut info = inspect(bytes.clone(), render_password.as_deref()).map_err(|e| e.to_string())?;let pdf_pages = info.pages.len();let acroform_fields = info.fields.len();// Dynamic XFA forms: say what laying the template out gives (what the app shows).@@@ -592,18 -628,9 +652,18 @@@ fn extract(args: &[String]) -> Result<(fn split(args: &[String]) -> Result<(), CliError> {validate_options("split", args, SPLIT_OPTIONS)?;use pdfcraft_engine::SplitBy;- let path = *positional(args).first().ok_or("split: missing file")?;+ let path = *positional(args, SPLIT_OPTIONS).first().ok_or("split: missing file")?;let by = match (flag(args, "--every"), flag(args, "--before")) {- (Some(n), None) => SplitBy::PageCount(n.parse().map_err(|_| "bad --every")?),+ (Some(n), None) => {+ // A count the splitter cannot hold is refused here, before the file is opened,+ // rather than silently clamped to 1 further down.+ let count = n+ .parse::<usize>()+ .ok()+ .filter(|count| *count > 0)+ .ok_or_else(|| format!("bad --every: expected a positive whole number of pages, got {n:?}"))?;+ SplitBy::PageCount(count)+ }(None, Some(list)) => SplitBy::Before(page_list(list)?),_ => return Err("split: give either --every N or --before PAGES".into()),};@@@ -623,28 -650,15 +683,28 @@@Ok(())}+/// A `--dpi` the renderer can be asked for: a positive, finite number. `0`, a negative value+/// or `NaN` parse as an `f32` but reach the renderer as a scale it refuses with its own+/// internal message (and in `check`, passed on as text, they would turn every file into a+/// child that printed nothing), so the CLI names the option and the value instead.+fn parse_dpi(value: &str) -> Result<f32, String> {+ value+ .parse::<f32>()+ .ok()+ .filter(|dpi| dpi.is_finite() && *dpi > 0.0)+ .ok_or_else(|| format!("bad --dpi: expected a positive number of dots per inch, got {value:?}"))+}+fn render(args: &[String]) -> Result<(), CliError> {validate_options("render", args, RENDER_OPTIONS)?;- let path = *positional(args).first().ok_or("render: missing file")?;+ let path = *positional(args, RENDER_OPTIONS).first().ok_or("render: missing file")?;- let page: usize = flag(args, "--page").unwrap_or("1").parse().map_err(|_| "bad --page")?;- let page_index = page.checked_sub(1).ok_or("--page must be at least 1")?;- let dpi: f32 = flag(args, "--dpi").unwrap_or("96").parse().map_err(|_| "bad --dpi")?;+ let page: usize =+ flag(args, "--page").unwrap_or("1").parse().ok().filter(|page| *page > 0).ok_or("bad --page: expected a positive page number")?;+ let page_index = page - 1;+ let dpi = parse_dpi(flag(args, "--dpi").unwrap_or("96"))?;let out = flag(args, "--out").ok_or("render: missing --out (.png, .jpg, .tif or .pam)")?;// The file is what its name says (#248): a `.png` used to get a netpbm PAM stream.- let format = match Path::new(out).extension().and_then(|e| e.to_str()).map(str::to_ascii_lowercase).as_deref() {+ let format = match Path::new(out).extension().and_then(std::ffi::OsStr::to_str).map(str::to_ascii_lowercase).as_deref() {Some("png") => Some(ImageFormat::Png),Some("jpg" | "jpeg") => Some(ImageFormat::Jpeg { quality: 90 }),Some("tif" | "tiff") => Some(ImageFormat::Tiff),@@@ -696,8 -706,8 +756,8 @@@/// Child-process body for `check`: prints one JSON line.fn check_one(args: &[String]) -> Result<(), CliError> {validate_options("check-one", args, CHECK_ONE_OPTIONS)?;- let path = *positional(args).first().ok_or("check-one: missing file")?;+ let path = *positional(args, CHECK_ONE_OPTIONS).first().ok_or("check-one: missing file")?;- let dpi: f32 = flag(args, "--dpi").unwrap_or("36").parse().map_err(|_| "bad --dpi")?;+ let dpi = parse_dpi(flag(args, "--dpi").unwrap_or("36"))?;let start = Instant::now();let bytes = read(path)?;let (status, pages, failed, detail, warnings) = match inspect(bytes.clone(), None) {@@@ -789,20 -799,7 +849,20 @@@ fn collect(paths: &[&str]) -> Vec<PathBfn check(args: &[String]) -> Result<(), CliError> {validate_options("check", args, CHECK_OPTIONS)?;+ // Every option is checked before the inputs are scanned, so a bad value is one message,+ // not one problem per file: a zero timeout used to make every file time out, and a bad+ // dpi used to reach each child, which printed nothing and was reported as a crash.+ let timeout_value = flag(args, "--timeout").unwrap_or("20");+ let timeout = Duration::from_secs(+ timeout_value+ .parse::<u64>()+ .ok()+ .filter(|secs| *secs > 0)+ .ok_or_else(|| format!("bad --timeout: expected a positive whole number of seconds, got {timeout_value:?}"))?,+ );+ let dpi = flag(args, "--dpi").unwrap_or("36").to_string();+ parse_dpi(&dpi)?;- let files = collect(&positional(args));+ let files = collect(&positional(args, CHECK_OPTIONS));if files.is_empty() {return Err("check: no PDF files found".into());}