[+] PBar: Multi-line progress bar

Author: hykilpikonna

src/main/java/org/hydev/mcpm/client/interaction/ProgressBar.java

@@ -36,7 +36,6 @@ public ProgressBar(ProgressBarTheme theme)
         this.cu = new ConsoleUtils(this.out);
         this.activeBars = new ArrayList<>();
         this.cols = AnsiConsole.getTerminalWidth();
-        System.out.println(cols);
     }
 
     /**
@@ -58,6 +57,31 @@ private void update()
         // Roll back to the first line
         cu.curUp(activeBars.size());
         activeBars.forEach(bar -> out.println(bar.fmt(theme, cols)));
+        activeBars.stream().toList().stream().filter(it -> it.completed >= it.total).forEach(this::finishBar);
+    }
+
+    /**
+     * Increase progress
+     *
+     * @param bar Progress row
+     * @param incr Increase amount
+     */
+    public void increase(ProgressRow bar, long incr)
+    {
+        bar.completed += incr;
+        update();
+    }
+
+    /**
+     * Set progress
+     *
+     * @param bar Progres bar
+     * @param completed Completed amount
+     */
+    public void set(ProgressRow bar, long completed)
+    {
+        bar.completed = completed;
+        update();
     }
 
     /**
@@ -68,8 +92,6 @@ private void update()
     public void finishBar(ProgressRow bar)
     {
         this.activeBars.remove(bar);
-        out.println();
-        update();
     }
 
     /**
@@ -80,30 +102,33 @@ public void finishBar(ProgressRow bar)
     @Override
     public void close()
     {
-        System.out.println("");
+    }
+
+    public List<ProgressRow> getActiveBars()
+    {
+        return activeBars;
     }
 
     public static void main(String[] args)
     {
         try (var b = new ProgressBar(ProgressBarTheme.ASCII_THEME))
         {
-            var r = b.appendBar(new ProgressRow(1000, "it"));
-            for (int i = 0; i < 1000; i++)
+            //var r = b.appendBar(new ProgressRow(1000, "it"));
+            //for (int i = 0; i < 1000; i++)
+            //{
+            //    b.increase(r, 1);
+            //    safeSleep(5);
+            //}
+
+            var all = new ArrayList<ProgressRow>();
+            for (int i = 0; i < 1300; i++)
             {
-                r.completed ++;
-                b.update();
-                safeSleep(10);
+                if (i < 1000 && i % 100 == 0) all.add(b.appendBar(new ProgressRow(300, "it")));
+                all.forEach(a -> b.increase(a, 1));
+                safeSleep(3);
             }
 
-
-            //var all = new ArrayList<ProgressRow>();
-            //for (int i = 0; i < 10; i++)
-            //{
-            //    all.add(b.appendBar(new ProgressRow(3, "it")));
-            //    all.forEach(a -> a.completed++);
-            //    b.update();
-            //    safeSleep(1000);
-            //}
+            System.out.println("Done");
         }
     }
 }

src/main/java/org/hydev/mcpm/client/interaction/ProgressRow.java

@@ -1,5 +1,7 @@
 package org.hydev.mcpm.client.interaction;
 
+import java.util.Objects;
+
 import static java.lang.String.format;
 
 /**
@@ -19,6 +21,9 @@ public ProgressRow(long total, String unit)
         this.total = total;
         this.completed = 0;
         this.unit = unit;
+
+        // Add leading space
+        if (!unit.isBlank() && !unit.startsWith(" ")) this.unit = " " + unit;
     }
 
     public ProgressRow(long total)
@@ -37,7 +42,7 @@ public String fmt(ProgressBarTheme theme, int cols)
     {
         double p = 100d * completed / total;
         var placeholder = "PLACEHOLDER_BAR";
-        var t = format("%s%s%s %.0f %d/%d%s", theme.prefix(), placeholder, theme.suffix(), p, completed, total, unit);
+        var t = format("%s%s%s %.0f%% %5d/%-5d%s", theme.prefix(), placeholder, theme.suffix(), p, completed, total, unit);
 
         // Add progress bar length
         var len = cols - t.length() + placeholder.length();