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

allow explicitly specify files

Browse source
This commit is contained in:
LuckyTurtleDev 2023-09-22 19:30:10 +02:00
parent 1e3f007daf
commit d594efee09
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main.rs
View file

@ -363,10 +363,10 @@ fn collect_files(
out_file: &OutFile, out_file: &OutFile,
recursive: bool, recursive: bool,
include_non_png: bool, include_non_png: bool,
allow_stdin: bool, top_level: bool, //explicitly specify files
) -> Vec<(InFile, OutFile)> { ) -> Vec<(InFile, OutFile)> {
let mut in_out_pairs = Vec::new(); let mut in_out_pairs = Vec::new();
let allow_stdin = allow_stdin && files.len() == 1; let allow_stdin = top_level && files.len() == 1;
for input in files { for input in files {
let using_stdin = allow_stdin && input.to_str().map_or(false, |p| p == "-"); let using_stdin = allow_stdin && input.to_str().map_or(false, |p| p == "-");
if !using_stdin && input.is_dir() { if !using_stdin && input.is_dir() {
@ -403,7 +403,7 @@ fn collect_files(
} else { } else {
//skip non png files if recusive flag is used. //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); //(still allow the user to convert a non png file if recusive flag is not used);
if recursive && !include_non_png && { if !top_level && recursive && !include_non_png && {
let extension = input.extension().map(|f| f.to_ascii_lowercase()); let extension = input.extension().map(|f| f.to_ascii_lowercase());
extension != Some(OsString::from("png")) extension != Some(OsString::from("png"))
&& extension != Some(OsString::from("apng")) && extension != Some(OsString::from("apng"))