[O] PBar: Better access

Author: hykilpikonna

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

@@ -47,41 +47,18 @@ public ProgressBar(ProgressBarTheme theme)
     public ProgressRow appendBar(ProgressRow bar)
     {
         this.activeBars.add(bar);
-        out.println("");
+        bar.setPb(this);
+
+        out.println();
         update();
         return bar;
     }
 
-    private void update()
+    protected 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();
     }
 
     /**
@@ -116,15 +93,15 @@ public static void main(String[] args)
             //var r = b.appendBar(new ProgressRow(1000, "it"));
             //for (int i = 0; i < 1000; i++)
             //{
-            //    b.increase(r, 1);
+            //    r.increase(1);
             //    safeSleep(5);
             //}
 
             var all = new ArrayList<ProgressRow>();
             for (int i = 0; i < 1300; i++)
             {
                 if (i < 1000 && i % 100 == 0) all.add(b.appendBar(new ProgressRow(300, "it")));
-                all.forEach(a -> b.increase(a, 1));
+                all.forEach(a -> a.increase(1));
                 safeSleep(3);
             }
 

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

@@ -12,18 +12,23 @@
  */
 public class ProgressRow
 {
-    protected long total;
-    protected long completed;
-    protected String unit;
+    private final long total;
+    private long completed;
+    private final String unit;
+
+    private long startTime;
+    private ProgressBar pb;
 
     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;
+        this.unit = (!unit.isBlank() && !unit.startsWith(" ")) ? " " + unit : unit;
+
+        // Record start time for speed estimation
+        this.startTime = System.nanoTime();
     }
 
     public ProgressRow(long total)
@@ -42,7 +47,7 @@ public String fmt(ProgressBarTheme theme, int cols)
     {
         double p = 100d * completed / total;
         var placeholder = "PLACEHOLDER_BAR";
-        var t = format("%s%s%s %.0f%% %5d/%-5d%s", theme.prefix(), placeholder, theme.suffix(), p, completed, total, unit);
+        var t = format("%s%s%s %3.0f%% %5d/%-5d%s", theme.prefix(), placeholder, theme.suffix(), p, completed, total, unit);
 
         // Add progress bar length
         var len = cols - t.length() + placeholder.length();
@@ -53,4 +58,33 @@ public String fmt(ProgressBarTheme theme, int cols)
 
         return t.replaceFirst(placeholder, bar);
     }
+
+    public void setPb(ProgressBar pb)
+    {
+        this.pb = pb;
+    }
+
+    /**
+     * Increase progress
+     *
+     * @param incr Increase amount
+     */
+    public void increase(long incr)
+    {
+        this.completed += incr;
+        pb.update();
+        if (completed >= total) pb.finishBar(this);
+    }
+
+    /**
+     * Set progress
+     *
+     * @param completed Completed amount
+     */
+    public void set(long completed)
+    {
+        this.completed = completed;
+        pb.update();
+        if (completed >= total) pb.finishBar(this);
+    }
 }