[+] PBar: Calculate ETA and speed

Author: hykilpikonna

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

@@ -58,7 +58,7 @@ protected void update()
     {
         // Roll back to the first line
         cu.curUp(activeBars.size());
-        activeBars.forEach(bar -> out.println(bar.fmt(theme, cols)));
+        activeBars.forEach(bar -> out.println(bar.toString(theme, cols)));
     }
 
     /**
@@ -90,7 +90,7 @@ public static void main(String[] args)
     {
         try (var b = new ProgressBar(ProgressBarTheme.ASCII_THEME))
         {
-            //var r = b.appendBar(new ProgressRow(1000, "it"));
+            //var r = b.appendBar(new ProgressRow(1000));
             //for (int i = 0; i < 1000; i++)
             //{
             //    r.increase(1);
@@ -100,7 +100,8 @@ public static void main(String[] args)
             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")));
+                if (i < 1000 && i % 100 == 0)
+                    all.add(b.appendBar(new ProgressRow(300).unit("MB").desc(format("File %s.tar.gz", all.size()))).descLen(40));
                 all.forEach(a -> a.increase(1));
                 safeSleep(3);
             }

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

@@ -48,20 +48,30 @@ private double elapsed()
      * @param cols Number of columns (width) of the terminal window
      * @return Formatted string
      */
-    public String fmt(ProgressBarTheme theme, int cols)
+    public String toString(ProgressBarTheme theme, int cols)
     {
-        double p = 100d * completed / total;
-        var placeholder = "PLACEHOLDER_BAR";
-        var t = format("%s%s%s %3.0f%% %5d/%-5d%s", theme.prefix(), placeholder, theme.suffix(), p, completed, total, unit);
+        // 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);
+
+        // 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("{speed}", format("%.2f%s/s", speed, unit))
+            .replace("{desc}", descLen != 0 ? format("%-" + descLen + "s", desc) : desc + " ");
 
         // Add progress bar length
-        var len = cols - t.length() + placeholder.length();
+        var len = cols - t.length() + "{progbar}".length();
 
         // Calculate progress length
         int pLen = (int) (1d * completed / total * len);
         var bar = theme.done().repeat(pLen / theme.doneLen()) + theme.ipr().repeat((len - pLen) / theme.iprLen());
 
-        return t.replaceFirst(placeholder, bar);
+        return t.replace("{progbar}", bar);
     }
 
     public void setPb(ProgressBar pb)