[incubator-nlpcraft] branch NLPCRAFT-108 updated: WIP.

[aradzinski]

This is an automated email from the ASF dual-hosted git repository.

aradzinski pushed a commit to branch NLPCRAFT-108
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git


The following commit(s) were added to refs/heads/NLPCRAFT-108 by this push:
     new 9438403  WIP.
9438403 is described below

commit 94384036da361bf1635ca825dae78f8cce9d0d9a
Author: Aaron Radzinski <aradzin...@datalingvo.com>
AuthorDate: Sat Oct 3 10:16:42 2020 -0700

    WIP.
---
 .../scala/org/apache/nlpcraft/common/package.scala | 16 +++++++++++--
 .../nlpcraft/model/tools/cmdline/NCCli.scala       | 27 ++++++++++++----------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala
index 3449c39..fadf539 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala
@@ -42,7 +42,6 @@ package object common {
     final val TOK_META_ALIASES_KEY = "__NLPCRAFT_TOK_META_ALIASES"
 
     // Real foreground color shortcuts...
-    def i(s: Any): String = s"$ansiReversed${s.toString}$ansiReset"
     def g(s: Any): String = s"$ansiGreenFg${s.toString}$ansiReset"
     def r(s: Any): String = s"$ansiRedFg${s.toString}$ansiReset"
     def c(s: Any): String = s"$ansiCyanFg${s.toString}$ansiReset"
@@ -50,7 +49,20 @@ package object common {
     def w(s: Any): String = s"$ansiWhiteFg${s.toString}$ansiReset"
     def b(s: Any): String = s"$ansiBlueFg${s.toString}$ansiReset"
     def k(s: Any): String = s"$ansiBlackFg${s.toString}$ansiReset"
-    
+
+    // Real background color shortcuts...
+    def gb(s: Any): String = s"$ansiGreenBg${s.toString}$ansiReset"
+    def rb(s: Any): String = s"$ansiRedBg${s.toString}$ansiReset"
+    def cb(s: Any): String = s"$ansiCyanBg${s.toString}$ansiReset"
+    def yb(s: Any): String = s"$ansiYellowBg${s.toString}$ansiReset"
+    def wb(s: Any): String = s"$ansiWhiteBg${s.toString}$ansiReset"
+    def bb(s: Any): String = s"$ansiBlueBg${s.toString}$ansiReset"
+    def kb(s: Any): String = s"$ansiBlackBg${s.toString}$ansiReset"
+
+    // Real color effect shortcuts...
+    def rv(s: Any): String = s"$ansiReversed${s.toString}$ansiReset"
+    def bo(s: Any): String = s"$ansiBold${s.toString}$ansiReset"
+
     /**
      * 
      * @param f
diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
index 74163e7..1620afe 100644
--- 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
+++ 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
@@ -506,7 +506,7 @@ object NCCli extends App {
                     error(s"Check output for errors: 
${c(output.getAbsolutePath)}")
                 }
                 else {
-                    logln(g("[OK]"))
+                    logln(g("OK"))
                     logln(mkServerBeaconTable(beacon).toString)
                 }
             }
@@ -827,7 +827,7 @@ object NCCli extends App {
     private def mkServerBeaconTable(beacon: NCCliServerBeacon): NCAsciiTable = 
{
         val tbl = new NCAsciiTable
 
-        tbl += (s"PID", s"${g(beacon.pid)} ${b("[s]")}")
+        tbl += ("PID", s"${g(beacon.pid)}")
         tbl += ("JDBC URL", s"${g(beacon.jdbcUrl)}")
         tbl += ("REST endpoint", s"${g(beacon.restEndpoint)}")
         tbl += ("Uplink", s"${g(beacon.upLink)}")
@@ -943,7 +943,8 @@ object NCCli extends App {
 
         new AutosuggestionWidgets(reader).enable()
 
-        logln(s"Hit ${i(" tab ")} or type '${c("help")}' to get help, 
'${c("quit")}' to exit.")
+        logln(s"Hit ${rv(" Tab ")} or type '${c("help")}' to get help, 
'${c("quit")}' to exit.")
+        logln()
 
         var exit = false
 
@@ -958,16 +959,18 @@ object NCCli extends App {
         pinger.start()
 
         while (!exit) {
-            val prompt = if (state.isServer) s"${b("[s]")}${g("\u25b6")} " 
else s"${g("\u25b6")} "
+            val rawLine = try {
+                val srvStr = bo(s"${if (state.isServer) s"ON " else s"OFF "}")
+                val acsTokStr = bo(s"${state.accessToken.getOrElse("")} ")
 
-            val rawLine =
-                try
-                    reader.readLine(prompt)
-                catch {
-                    case _: PatternSyntaxException ⇒ "" // Guard against JLine 
hiccups.
-                    case _: UserInterruptException ⇒ "" // Ignore.
-                    case _: EndOfFileException ⇒ null
-                }
+                reader.printAbove(rb(s" server: $srvStr") + wb(k(s" acsTok: 
$acsTokStr")))
+                reader.readLine(s"${g("\u25b6")} ")
+            }
+            catch {
+                case _: PatternSyntaxException ⇒ "" // Guard against JLine 
hiccups.
+                case _: UserInterruptException ⇒ "" // Ignore.
+                case _: EndOfFileException ⇒ null
+            }
 
             if (rawLine == null || QUIT_CMD.name == rawLine.trim)
                 exit = true