Add --progress flag

joshmoore · joshmoore · commit 3c4f99282203 · 2021-03-04T09:39:35.000+01:00
diff --git a/src/main/java/com/glencoesoftware/bioformats2raw/Converter.java b/src/main/java/com/glencoesoftware/bioformats2raw/Converter.java
@@ -157,6 +157,13 @@ public class Converter implements Callable<Void> {
   )
   private volatile String logLevel = "WARN";
 
+  @Option(
+    names = {"-p", "--progress"},
+    description = "Print progress bars during conversion",
+    help = true
+  )
+  private volatile boolean progressBars = false;
+
   @Option(
     names = "--version",
     description = "Print version information and exit",
@@ -1021,18 +1028,26 @@ public void saveResolutions(int series)
       List<CompletableFuture<Void>> futures =
         new ArrayList<CompletableFuture<Void>>();
 
-      ProgressBarBuilder builder = new ProgressBarBuilder()
-        .setInitialMax(tileCount)
-        .setTaskName(String.format("[%d/%d]", series, resolution));
+      final ProgressBar pb;
+      if (progressBars) {
+        ProgressBarBuilder builder = new ProgressBarBuilder()
+          .setInitialMax(tileCount)
+          .setTaskName(String.format("[%d/%d]", series, resolution));
+
+        if (!(logLevel.equals("OFF") ||
+          logLevel.equals("ERROR") ||
+          logLevel.equals("WARN")))
+        {
+          builder.setConsumer(new DelegatingProgressBarConsumer(LOGGER::trace));
+        }
 
-      if (!(logLevel.equals("OFF") ||
-        logLevel.equals("ERROR") ||
-        logLevel.equals("WARN")))
-      {
-        builder.setConsumer(new DelegatingProgressBarConsumer(LOGGER::trace));
+        pb = builder.build();
+      }
+      else {
+        pb = null;
       }
 
-      try (ProgressBar pb = builder.build()) {
+      try {
         for (int j=0; j<scaledHeight; j+=tileHeight) {
           final int yy = j;
           int height = (int) Math.min(tileHeight, scaledHeight - yy);
@@ -1061,7 +1076,9 @@ public void saveResolutions(int series)
                     resolution, plane, xx, yy, width, height, t);
                 }
                 finally {
-                  pb.step();
+                  if (pb != null) {
+                    pb.step();
+                  }
                 }
               });
             }
@@ -1077,6 +1094,11 @@ public void saveResolutions(int series)
         //  and need re-throwing
 
       }
+      finally {
+        if (pb != null) {
+          pb.close();
+        }
+      }
     }
   }
 
