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

Revert "Allow strip and keep to be used together (#580)"

Browse source 
This reverts commit 97af04a539.
This commit is contained in:
Andrew 2023-11-27 19:11:18 +13:00
parent f6c24409f1
commit f9db89342a
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main.rs
View file

@ -176,7 +176,9 @@ depth is changed, regardless of any options set.",
Arg::new("keep")
.help("Strip all metadata except in the comma-separated list")
.long("keep")
.value_name("list"),
.value_name("list")
.conflicts_with("strip")
.conflicts_with("strip-safe"),
)
.arg(
Arg::new("alpha")
@ -611,6 +613,14 @@ fn parse_opts_into_struct(
};
}
if let Some(keep) = matches.get_one::<String>("keep") {
let names = keep
.split(',')
.map(parse_chunk_name)
.collect::<Result<_, _>>()?;
opts.strip = StripChunks::Keep(names)
}
if let Some(strip) = matches.get_one::<String>("strip") {
if strip == "safe" {
opts.strip = StripChunks::Safe;
@ -637,23 +647,10 @@ fn parse_opts_into_struct(
.collect::<Result<_, _>>()?;
opts.strip = StripChunks::Strip(names);
}
} else if matches.get_flag("strip-safe") {
opts.strip = StripChunks::Safe;
}
if let Some(keep) = matches.get_one::<String>("keep") {
if matches!(opts.strip, StripChunks::Strip(_)) {
return Err("--strip <list> and --keep cannot be used together".to_owned());
}
let mut names: IndexSet<_> = keep
.split(',')
.map(parse_chunk_name)
.collect::<Result<_, _>>()?;
if opts.strip == StripChunks::Safe {
// Add the keep safe chunks to the list
names.extend(StripChunks::KEEP_SAFE.iter().cloned());
}
opts.strip = StripChunks::Keep(names);
if matches.get_flag("strip-safe") {
opts.strip = StripChunks::Safe;
}
if matches.get_flag("zopfli") {