commit f39e68a765870f87683f5f52f13714bad0b335c3
author Aaron Radzinski <aradzinski@datalingvo.com> Mon Aug 23 23:42:05 2021 -0700
committer Aaron Radzinski <aradzinski@datalingvo.com> Mon Aug 23 23:42:05 2021 -0700
tree 3ff1ee90186c8cc97e359dd888c19fb3e00a7b3a
parent d1900de8ad3a1101bf1260bfb1d24cf40b62dcc5

Update NCAnsiProgressBar.scala

nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsiProgressBar.scala

diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsiProgressBar.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsiProgressBar.scala
index 5c1e4af..cb7dac2 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsiProgressBar.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ansi/NCAnsiProgressBar.scala
@@ -18,9 +18,9 @@
 package org.apache.nlpcraft.common.ansi
 
 import java.io.PrintWriter
-
 import org.apache.nlpcraft.common._
 import NCAnsi._
+import org.apache.commons.lang3.StringUtils
 import org.apache.nlpcraft.common.ansi.NCAnsiProgressBar._
 
 /**
@@ -44,10 +44,9 @@
     
     private final val mux = new Object()
 
-    //noinspection ZeroIndexToHead
-    private final val PB_LEFT = s"$B${CHAR_SET(0)}$RST"
+    private final val PB_LEFT = s"$B${CHAR_SET.head}$RST"
     private final val PB_RIGHT = s"$B${CHAR_SET(3)}$RST"
-    private final val PB_EMPTY =s"$W${CHAR_SET(2)}$RST"
+    private final val PB_EMPTY = s"$W${CHAR_SET(2)}$RST"
     private final val PB_FULL = s"$R$BO${CHAR_SET(1)}$RST"
     private final val PB_LEAD = s"$Y$BO${CHAR_SET(4)}$RST"
 
@@ -55,7 +54,7 @@
      *
      */
     private def clean(): Unit = {
-        out.print(ansiCursorLeft * (dispSize + 2))
+        out.print(ansiCursorLeft * (dispSize + 2/* Left & right brackets. */ + 5/* % string. */))
         out.print(ansiClearLineAfter)
         out.flush()
     }
@@ -73,6 +72,8 @@
             out.print(PB_LEFT)
             out.print(PB_EMPTY * dispSize)
             out.print(PB_RIGHT)
+            out.print(" ")
+            out.print(s"${W}0%  $RST")
 
             out.flush()
         }
@@ -88,7 +89,9 @@
             if (useAnsi) {
                 clean()
 
-                val bar = if (tick == 1) 1 else Math.round((tick.toFloat / totalTicks.toFloat) * dispSize)
+                val ratio = tick.toFloat / totalTicks.toFloat
+                val bar = if (tick == 1) 1 else Math.round(ratio * dispSize)
+                val pct = Math.round(ratio * 100)
 
                 out.print(PB_LEFT)
                 for (i <- 0 until dispSize) {
@@ -100,6 +103,8 @@
                         out.print(PB_EMPTY)
                 }
                 out.print(PB_RIGHT)
+                out.print(" ")
+                out.print(W + StringUtils.rightPad(s"$pct%",4) + RST)
                 out.flush()
             }
             else if (tick == 1 || tick % (totalTicks / dispSize) == 0) {
@@ -126,7 +131,7 @@
 
             // Show cursor.
             out.print(ansiCursorShow)
-            out.flush()
+            out.flush() 
         }
     }
 }