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

Apply comments

Browse source
This commit is contained in:
DoumanAsh 2023-04-03 09:29:30 +09:00 committed by Josh Holmer
parent 3b086c34f1
commit 6f5436eef3
2 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib.rs
View file

@ -644,14 +644,14 @@ fn optimize_png(
); );
} }
if file_original_size >= output.len() { if file_original_size >= output.len() {
debug!( info!(
" file size = {} bytes ({} bytes = {:.2}% decrease)", " file size = {} bytes ({} bytes = {:.2}% decrease)",
output.len(), output.len(),
file_original_size - output.len(), file_original_size - output.len(),
(file_original_size - output.len()) as f64 / file_original_size as f64 * 100_f64 (file_original_size - output.len()) as f64 / file_original_size as f64 * 100_f64
); );
} else { } else {
debug!( info!(
" file size = {} bytes ({} bytes = {:.2}% increase)", " file size = {} bytes ({} bytes = {:.2}% increase)",
output.len(), output.len(),
output.len() - file_original_size, output.len() - file_original_size,

35
tests/flags.rs
View file

@ -170,18 +170,35 @@ 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",
" File size = 114708 bytes",
"Trying: 1 filters",
" zc = 11 f = None 149409 bytes",
"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 {:?}", "logs[{}] = {:?} doesn't start with {:?}",
i, idx, log, expected_log
log,
expected_prefix
); );
} }
} else {
panic!(
"Expected to find {} log entries, but got {}",
expected_logs.len(),
logs.len()
);
}
}
} }
#[test] #[test]