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

Refactoring to use appropriate log level for debug logs (#489)

Browse source
This commit is contained in:
Douman 2023-04-04 13:48:01 +09:00 committed by GitHub
parent 5341de2163
commit cc37f645ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/lib.rs
View file

@ -466,13 +466,13 @@ fn optimize_png(
// Print png info // Print png info
let file_original_size = original_data.len(); let file_original_size = original_data.len();
let idat_original_size = png.idat_data.len(); let idat_original_size = png.idat_data.len();
info!( debug!(
" {}x{} pixels, PNG format", " {}x{} pixels, PNG format",
png.raw.ihdr.width, png.raw.ihdr.height png.raw.ihdr.width, png.raw.ihdr.height
); );
report_format(" ", &png.raw); report_format(" ", &png.raw);
info!(" IDAT size = {} bytes", idat_original_size); debug!(" IDAT size = {} bytes", idat_original_size);
info!(" File size = {} bytes", file_original_size); debug!(" File size = {} bytes", file_original_size);
// Do this first so that reductions can ignore certain chunks such as bKGD // Do this first so that reductions can ignore certain chunks such as bKGD
perform_strip(png, opts); perform_strip(png, opts);
@ -560,7 +560,7 @@ fn optimize_png(
None None
} }
} else { } else {
info!("Trying: {}", trial.filter); debug!("Trying: {}", trial.filter);
let original_len = idat_original_size; let original_len = idat_original_size;
let best_size = AtomicMin::new(if opts.force { None } else { Some(original_len) }); let best_size = AtomicMin::new(if opts.force { None } else { Some(original_len) });
perform_trial(&png.filtered, opts, trial, &best_size) perform_trial(&png.filtered, opts, trial, &best_size)
@ -591,7 +591,7 @@ fn optimize_png(
}); });
} }
info!("Trying: {} filters", results.len()); debug!("Trying: {} filters", results.len());
let original_len = idat_original_size; let original_len = idat_original_size;
let best_size = AtomicMin::new(if opts.force { None } else { Some(original_len) }); let best_size = AtomicMin::new(if opts.force { None } else { Some(original_len) });
@ -614,8 +614,8 @@ fn optimize_png(
if let Some((opts, idat_data)) = best { if let Some((opts, idat_data)) = best {
png.idat_data = idat_data; png.idat_data = idat_data;
info!("Found better combination:"); debug!("Found better combination:");
info!( debug!(
" zc = {} f = {} {} bytes", " zc = {} f = {} {} bytes",
opts.compression, opts.compression,
opts.filter, opts.filter,
@ -631,13 +631,13 @@ fn optimize_png(
let output = png.output(); let output = png.output();
if idat_original_size >= png.idat_data.len() { if idat_original_size >= png.idat_data.len() {
info!( debug!(
" IDAT size = {} bytes ({} bytes decrease)", " IDAT size = {} bytes ({} bytes decrease)",
png.idat_data.len(), png.idat_data.len(),
idat_original_size - png.idat_data.len() idat_original_size - png.idat_data.len()
); );
} else { } else {
info!( debug!(
" IDAT size = {} bytes ({} bytes increase)", " IDAT size = {} bytes ({} bytes increase)",
png.idat_data.len(), png.idat_data.len(),
png.idat_data.len() - idat_original_size png.idat_data.len() - idat_original_size
@ -815,7 +815,7 @@ impl Deadline {
/// Display the format of the image data /// Display the format of the image data
fn report_format(prefix: &str, png: &PngImage) { fn report_format(prefix: &str, png: &PngImage) {
if let Some(ref palette) = png.palette { if let Some(ref palette) = png.palette {
info!( debug!(
"{}{} bits/pixel, {} colors in palette ({})", "{}{} bits/pixel, {} colors in palette ({})",
prefix, prefix,
png.ihdr.bit_depth, png.ihdr.bit_depth,
@ -823,7 +823,7 @@ fn report_format(prefix: &str, png: &PngImage) {
png.ihdr.interlaced png.ihdr.interlaced
); );
} else { } else {
info!( debug!(
"{}{}x{} bits/pixel, {} ({})", "{}{}x{} bits/pixel, {} ({})",
prefix, prefix,
png.channels_per_pixel(), png.channels_per_pixel(),

39
tests/flags.rs
View file

@ -170,17 +170,34 @@ fn verbose_mode() {
}); });
let mut logs: Vec<_> = receiver.into_iter().collect(); let mut logs: Vec<_> = receiver.into_iter().collect();
assert_eq!(logs.len(), 1); println!("logs={:?}", logs);
logs.sort(); assert_eq!(logs.len(), 9);
for (i, log) in logs.into_iter().enumerate() { let expected_logs = [
let expected_prefix = format!(" zc = 11 f = None "); " 500x400 pixels, PNG format",
assert!( " 3x8 bits/pixel, RGB (non-interlaced)",
log.starts_with(&expected_prefix), " IDAT size = 113794 bytes",
"logs[{}] = {:?} doesn't start with {:?}", " File size = 114708 bytes",
i, "Trying: 1 filters",
log, " zc = 11 f = None 149409 bytes",
expected_prefix "Found better combination:",
); " zc = 11 f = None 149409 bytes",
" IDAT size = 149409 bytes",
];
for (idx, expected_log) in expected_logs.into_iter().enumerate() {
if let Some(log) = logs.get(idx) {
if !log.starts_with(expected_log) {
panic!(
"logs[{}] = {:?} doesn't start with {:?}",
idx, log, expected_log
);
}
} else {
panic!(
"Expected to find {} log entries, but got {}",
expected_logs.len(),
logs.len()
);
}
} }
} }