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

Merge pull request #20 from SethDusek/master

Browse source 
Fixed quiet mode
This commit is contained in:
Josh Holmer 2016-03-04 11:52:30 -05:00
commit 5a081dc811
1 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/lib.rs
View file

@ -45,7 +45,7 @@ pub struct Options {
pub fn optimize(filepath: &Path, opts: &Options) -> Result<(), String> { pub fn optimize(filepath: &Path, opts: &Options) -> Result<(), String> {
// Decode PNG from file // Decode PNG from file
println!("Processing: {}", filepath.to_str().unwrap()); if opts.verbosity.is_some() { println!("Processing: {}", filepath.to_str().unwrap()) };
let in_file = Path::new(filepath); let in_file = Path::new(filepath);
let mut png = match png::PngData::new(&in_file) { let mut png = match png::PngData::new(&in_file) {
Ok(x) => x, Ok(x) => x,
@ -121,7 +121,7 @@ pub fn optimize(filepath: &Path, opts: &Options) -> Result<(), String> {
let combinations = opts.filter.len() * opts.compression.len() * opts.memory.len() * let combinations = opts.filter.len() * opts.compression.len() * opts.memory.len() *
opts.strategies.len(); opts.strategies.len();
let mut results = Vec::with_capacity(combinations); let mut results = Vec::with_capacity(combinations);
println!("Trying: {} combinations", combinations); if opts.verbosity.is_some() { println!("Trying: {} combinations", combinations) };
crossbeam::scope(|scope| { crossbeam::scope(|scope| {
for f in &opts.filter { for f in &opts.filter {
let filtered = png.filter_image(*f); let filtered = png.filter_image(*f);
@ -172,6 +172,7 @@ pub fn optimize(filepath: &Path, opts: &Options) -> Result<(), String> {
if let Some(better) = best { if let Some(better) = best {
png.idat_data = better.4.clone(); png.idat_data = better.4.clone();
if opts.verbosity.is_some() {
println!("Found better combination:"); println!("Found better combination:");
println!(" zc = {} zm = {} zs = {} f = {} {} bytes", println!(" zc = {} zm = {} zs = {} f = {} {} bytes",
better.1, better.1,
@ -179,6 +180,7 @@ pub fn optimize(filepath: &Path, opts: &Options) -> Result<(), String> {
better.3, better.3,
better.0, better.0,
png.idat_data.len()); png.idat_data.len());
}
} }
} }
@ -225,37 +227,40 @@ pub fn optimize(filepath: &Path, opts: &Options) -> Result<(), String> {
} }
}; };
let mut buffer = BufWriter::new(out_file); let mut buffer = BufWriter::new(out_file);
match buffer.write_all(&output_data) { if opts.verbosity.is_some() {
Ok(_) => println!("Output: {}", opts.out_file.display()), match buffer.write_all(&output_data) {
Err(_) => { Ok(_) => println!("Output: {}", opts.out_file.display()),
return Err(format!("Unable to write to file {}", opts.out_file.display())) Err(_) => {
return Err(format!("Unable to write to file {}", opts.out_file.display()))
}
} }
} }
} }
} }
if idat_original_size >= png.idat_data.len() { if opts.verbosity.is_some() {
println!(" IDAT size = {} bytes ({} bytes decrease)", if idat_original_size >= png.idat_data.len() {
png.idat_data.len(), println!(" IDAT size = {} bytes ({} bytes decrease)",
idat_original_size - png.idat_data.len()); png.idat_data.len(),
} else { idat_original_size - png.idat_data.len());
println!(" IDAT size = {} bytes ({} bytes increase)", } else {
png.idat_data.len(), println!(" IDAT size = {} bytes ({} bytes increase)",
png.idat_data.len() - idat_original_size); png.idat_data.len(),
png.idat_data.len() - idat_original_size);
}
if file_original_size >= output_data.len() {
println!(" file size = {} bytes ({} bytes = {:.2}% decrease)",
output_data.len(),
file_original_size - output_data.len(),
(file_original_size - output_data.len()) as f64 / file_original_size as f64 *
100f64);
} else {
println!(" file size = {} bytes ({} bytes = {:.2}% increase)",
output_data.len(),
output_data.len() - file_original_size,
(output_data.len() - file_original_size) as f64 / file_original_size as f64 *
100f64);
}
} }
if file_original_size >= output_data.len() {
println!(" file size = {} bytes ({} bytes = {:.2}% decrease)",
output_data.len(),
file_original_size - output_data.len(),
(file_original_size - output_data.len()) as f64 / file_original_size as f64 *
100f64);
} else {
println!(" file size = {} bytes ({} bytes = {:.2}% increase)",
output_data.len(),
output_data.len() - file_original_size,
(output_data.len() - file_original_size) as f64 / file_original_size as f64 *
100f64);
}
Ok(()) Ok(())
} }