From cc37f645ba7ca5fb63d982b487d9a61d196c70a3 Mon Sep 17 00:00:00 2001
From: Douman <douman@gmx.se>
Date: Tue, 4 Apr 2023 13:48:01 +0900
Subject: [PATCH] Refactoring to use appropriate log level for debug logs
 (#489)

---
 src/lib.rs     | 22 +++++++++++-----------
 tests/flags.rs | 39 ++++++++++++++++++++++++++++-----------
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 17bdaee0..614246ce 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -466,13 +466,13 @@ fn optimize_png(
     // Print png info
     let file_original_size = original_data.len();
     let idat_original_size = png.idat_data.len();
-    info!(
+    debug!(
         "    {}x{} pixels, PNG format",
         png.raw.ihdr.width, png.raw.ihdr.height
     );
     report_format("    ", &png.raw);
-    info!("    IDAT size = {} bytes", idat_original_size);
-    info!("    File size = {} bytes", file_original_size);
+    debug!("    IDAT size = {} bytes", idat_original_size);
+    debug!("    File size = {} bytes", file_original_size);
 
     // Do this first so that reductions can ignore certain chunks such as bKGD
     perform_strip(png, opts);
@@ -560,7 +560,7 @@ fn optimize_png(
                     None
                 }
             } else {
-                info!("Trying: {}", trial.filter);
+                debug!("Trying: {}", trial.filter);
                 let original_len = idat_original_size;
                 let best_size = AtomicMin::new(if opts.force { None } else { Some(original_len) });
                 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 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 {
             png.idat_data = idat_data;
-            info!("Found better combination:");
-            info!(
+            debug!("Found better combination:");
+            debug!(
                 "    zc = {}  f = {}  {} bytes",
                 opts.compression,
                 opts.filter,
@@ -631,13 +631,13 @@ fn optimize_png(
     let output = png.output();
 
     if idat_original_size >= png.idat_data.len() {
-        info!(
+        debug!(
             "    IDAT size = {} bytes ({} bytes decrease)",
             png.idat_data.len(),
             idat_original_size - png.idat_data.len()
         );
     } else {
-        info!(
+        debug!(
             "    IDAT size = {} bytes ({} bytes increase)",
             png.idat_data.len(),
             png.idat_data.len() - idat_original_size
@@ -815,7 +815,7 @@ impl Deadline {
 /// Display the format of the image data
 fn report_format(prefix: &str, png: &PngImage) {
     if let Some(ref palette) = png.palette {
-        info!(
+        debug!(
             "{}{} bits/pixel, {} colors in palette ({})",
             prefix,
             png.ihdr.bit_depth,
@@ -823,7 +823,7 @@ fn report_format(prefix: &str, png: &PngImage) {
             png.ihdr.interlaced
         );
     } else {
-        info!(
+        debug!(
             "{}{}x{} bits/pixel, {} ({})",
             prefix,
             png.channels_per_pixel(),
diff --git a/tests/flags.rs b/tests/flags.rs
index 7ab6e0ab..6ff0ee85 100644
--- a/tests/flags.rs
+++ b/tests/flags.rs
@@ -170,17 +170,34 @@ fn verbose_mode() {
     });
 
     let mut logs: Vec<_> = receiver.into_iter().collect();
-    assert_eq!(logs.len(), 1);
-    logs.sort();
-    for (i, log) in logs.into_iter().enumerate() {
-        let expected_prefix = format!("    zc = 11  f = None ");
-        assert!(
-            log.starts_with(&expected_prefix),
-            "logs[{}] = {:?} doesn't start with {:?}",
-            i,
-            log,
-            expected_prefix
-        );
+    println!("logs={:?}", logs);
+    assert_eq!(logs.len(), 9);
+    let expected_logs = [
+        "    500x400 pixels, PNG format",
+        "    3x8 bits/pixel, RGB (non-interlaced)",
+        "    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 {:?}",
+                    idx, log, expected_log
+                );
+            }
+        } else {
+            panic!(
+                "Expected to find {} log entries, but got {}",
+                expected_logs.len(),
+                logs.len()
+            );
+        }
     }
 }