danvics/oxipng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

skip non png files, if --recursive is used

Browse source
This commit is contained in:
LuckyTurtleDev 2023-08-06 12:37:21 +02:00
parent 02bd47ba29
commit 738d59f404
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main.rs
View file

@ -25,6 +25,7 @@ use oxipng::RowFilter;
use oxipng::StripChunks; use oxipng::StripChunks;
use oxipng::{InFile, OutFile}; use oxipng::{InFile, OutFile};
use rayon::prelude::*; use rayon::prelude::*;
use std::ffi::OsStr;
use std::fs::DirBuilder; use std::fs::DirBuilder;
use std::io::Write; use std::io::Write;
#[cfg(feature = "zopfli")] #[cfg(feature = "zopfli")]
@ -327,6 +328,7 @@ Heuristic filter selection strategies:
); );
let success = files.into_par_iter().filter(|(input, output)| { let success = files.into_par_iter().filter(|(input, output)| {
match oxipng::optimize(input, output, &opts) { match oxipng::optimize(input, output, &opts) {
// For optimizing single files, this will return the correct exit code always. // For optimizing single files, this will return the correct exit code always.
// For recursive optimization, the correct choice is a bit subjective. // For recursive optimization, the correct choice is a bit subjective.
@ -385,6 +387,11 @@ fn collect_files(
let in_file = if using_stdin { let in_file = if using_stdin {
InFile::StdIn InFile::StdIn
} else { } else {
//skip non png files if recusive flag is used.
//(still allow the user to convert a non png file if recusive flag is not used)
if Some(OsStr::new("png")) != input.extension() && recursive {
continue;
}
InFile::Path(input) InFile::Path(input)
}; };
in_out_pairs.push((in_file, out_file)); in_out_pairs.push((in_file, out_file));