[O] PBar: Limit refresh rate to 60fps

Author: hykilpikonna

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

@@ -24,6 +24,8 @@ public class ProgressBar implements AutoCloseable
 
     private final List<ProgressRow> activeBars;
 
+    private long lastUpdate;
+
     /**
      * Create and initialize a progress bar
      *
@@ -36,6 +38,9 @@ public ProgressBar(ProgressBarTheme theme)
         this.cu = new ConsoleUtils(this.out);
         this.activeBars = new ArrayList<>();
         this.cols = AnsiConsole.getTerminalWidth();
+
+        // Last update time
+        this.lastUpdate = System.nanoTime();
     }
 
     /**
@@ -55,6 +60,18 @@ public ProgressRow appendBar(ProgressRow bar)
     }
 
     protected void update()
+    {
+        // Check time, update only every 0.0166s (60 fps)
+        // Performance of the update heavily depends on the terminal's escape code handling
+        // implementation, so frequent updates will degrade performance on a bad terminal
+        var curTime = System.nanoTime();
+        if ((curTime - lastUpdate) / 1e9d < 0.0166) return;
+        lastUpdate = curTime;
+
+        forceUpdate();
+    }
+
+    private void forceUpdate()
     {
         // Roll back to the first line
         cu.curUp(activeBars.size());
@@ -68,6 +85,9 @@ protected void update()
      */
     public void finishBar(ProgressRow bar)
     {
+        if (!activeBars.contains(bar)) return;
+
+        forceUpdate();
         this.activeBars.remove(bar);
     }
 

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

@@ -53,14 +53,14 @@ public String toString(ProgressBarTheme theme, int cols)
         // Calculate speed. TODO: Use a moving window to calculate speed
         double speed = completed / elapsed();
         double eta = total / speed;
-        long eta_s = (long) (eta % 60), eta_m = (long) (eta / 60);
+        long etaS = (long) (eta % 60), etaM = (long) (eta / 60);
 
         // Replace variables
         var p = format("%3.0f%%", 100d * completed / total);
         var t = fmt.replace("{prefix}", theme.prefix())
             .replace("{suffix}", theme.suffix())
             .replace("{%done}", p)
-            .replace("{eta}", format("%02d:%02d", eta_m, eta_s))
+            .replace("{eta}", format("%02d:%02d", etaM, etaS))
             .replace("{speed}", format("%.2f%s/s", speed, unit))
             .replace("{desc}", descLen != 0 ? format("%-" + descLen + "s", desc) : desc + " ");
 
@@ -86,6 +86,8 @@ public void setPb(ProgressBar pb)
      */
     public void increase(long incr)
     {
+        if (this.completed >= total) return;
+
         this.completed += incr;
         pb.update();
         if (completed >= total) pb.finishBar(this);
@@ -98,6 +100,8 @@ public void increase(long incr)
      */
     public void set(long completed)
     {
+        if (this.completed >= total) return;
+
         this.completed = completed;
         pb.update();
         if (completed >= total) pb.finishBar(this);