zopfli.png: don't print to console unless --verbose

fonttools · Mar 3, 2022 · eecfe3d · eecfe3d
1 parent c89269b
commit eecfe3d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/zopfli/png.py b/src/zopfli/png.py
@@ -11,7 +11,7 @@ def main(args=None):
     parser = argparse.ArgumentParser(prog="python -m zopfli.png")
     parser.add_argument("infile")
     parser.add_argument("outfile")
-    parser.add_argument("-v", "--verbose", action="store_true")
+    parser.add_argument("-v", "--verbose", action="store_true", help="print more info")
     parser.add_argument(
         "-m",
         action="store_true",
@@ -87,6 +87,8 @@ def main(args=None):
 
     options = parser.parse_args(args)
 
+    log = print if options.verbose else lambda *_: None
+
     if options.iterations is not None:
         num_iterations = num_iterations_large = options.iterations
     else:
@@ -99,7 +101,7 @@ def main(args=None):
     with open(options.infile, "rb") as f:
         input_png = f.read()
 
-    print("Optimizing {}".format(options.infile))
+    log(f"Optimizing {options.infile}")
 
     result_png = optimize(
         input_png,
@@ -114,33 +116,30 @@ def main(args=None):
     )
 
     input_size = len(input_png)
-    print("Input size: {} ({}K)".format(input_size, input_size // 1024))
+    log(f"Input size: {input_size} ({input_size // 1024}K)")
     result_size = len(result_png)
     percentage = round(result_size / input_size * 100, 3)
-    print(
-        "Result size: {} ({}K). Percentage of original: {}%".format(
-            result_size, result_size // 1024, percentage
-        )
+    log(
+        f"Result size: {result_size} ({result_size // 1024}K). "
+        f"Percentage of original: {percentage}%"
     )
 
     if result_size < input_size:
-        print("Result is smaller")
+        log("Result is smaller")
     elif result_size == input_size:
-        print("Result has exact same size")
+        log("Result has exact same size")
     else:
         if options.always_zopflify:
-            print("Original was smaller")
+            log("Original was smaller")
         else:
-            print("Preserving original PNG since it was smaller")
+            log("Preserving original PNG since it was smaller")
             # Set output file to input since zopfli didn't improve it.
             result_png = input_png
 
     if (
         not options.overwrite
         and os.path.isfile(options.outfile)
-        and input("File {} exists, overwrite? (y/N)\n".format(options.outfile))
-        .strip()
-        .lower()
+        and input(f"File {options.outfile} exists, overwrite? (y/N)\n").strip().lower()
         != "y"
     ):
         return 0

diff --git a/tests/test_zopfli.py b/tests/test_zopfli.py
@@ -108,7 +108,8 @@ def test_cli(self, png_file, tmp_path, options):
             + [str(png_file), str(output_file)]
         )
         p = subprocess.run(cmd, check=True, capture_output=True)
-        assert "Result is smaller" in p.stdout.decode()
+        if "-v" in options:
+            assert "Result is smaller" in p.stdout.decode()
         assert output_file.exists()
         assert output_file.stat().st_size < png_file.stat().st_size
 
@@ -120,7 +121,7 @@ def test_cli_overwrite(self, tmp_path, answer, overwrite):
         output_file = tmp_path / input_file.name
         shutil.copy(input_file, output_file)
         cmd = (
-            [sys.executable, "-m", "zopfli.png"]
+            [sys.executable, "-m", "zopfli.png", "-v"]
             + (["-y"] if overwrite else [])
             + [str(input_file), str(output_file)]
         )