MID-8842 ninja - upgrade command, input dialog improvements

Evolveum · Aug 31, 2023 · 5559fe9 · 5559fe9
1 parent f26d3c1
commit 5559fe9
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/VerifyAction.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/VerifyAction.java
@@ -89,6 +89,7 @@ public VerifyResult execute() throws Exception {
                 log.info("XML dump with delta for each item saved to '{}'", options.getOutput().getPath() + VerificationReporter.DELTA_FILE_NAME_SUFFIX);
             }
 
+            // todo this should not show when action is a part of complex action and next step is prepared automatically
             // FIXME: ADD links (do not display in batch mode)
             // FIXME: Could We could try to infer script name?
             if (context.isUserMode()) {

diff --git a/...ain/java/com/evolveum/midpoint/ninja/action/upgrade/action/UpgradeDistributionAction.java b/...ain/java/com/evolveum/midpoint/ninja/action/upgrade/action/UpgradeDistributionAction.java
@@ -17,7 +17,7 @@ public String getOperationName() {
     @Override
     public ActionResult<Void> execute() throws Exception {
         File tempDirectory = createTmpDirectory(options.getTempDirectory());
-        // FIXME: Should we log pre-upgrade checks
+        // todo: Should we log pre-upgrade checks
 
         // pre-upgrade checks
         if (!options.isSkipPreCheck()) {

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/impl/Log.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/impl/Log.java
@@ -80,4 +80,13 @@ public void log(LogLevel level, String message, Object... args) {
 
         stream.println(ConsoleFormat.formatLogMessage(level, formatted));
     }
+
+    /**
+     * Prints raw message without any processing, not even new line character at the end.
+     *
+     * @param message
+     */
+    public void logRaw(String message) {
+        stream.print(message);
+    }
 }
diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/ConsoleFormat.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/ConsoleFormat.java
@@ -97,4 +97,11 @@ public static String rewriteConsoleLine(String newLine) {
                 .cursorUpLine().eraseLine(Ansi.Erase.ALL)
                 .a(newLine).toString();
     }
+
+    public static String formatInputPrompt() {
+        return Ansi.ansi()
+                .reset()
+                .a("[").fgBright(Ansi.Color.MAGENTA).a("INPUT").reset().a("] > ")
+                .toString();
+    }
 }
diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/util/NinjaUtils.java
@@ -276,7 +276,8 @@ private static boolean containsFileNames(String[] names, String filenameRegex) {
         return Arrays.stream(names).anyMatch(s -> s.matches(filenameRegex));
     }
 
-    public static String readInput(Log log, Function<String, Boolean> inputValidation) throws IOException {
+    public static String readInput(Log log, Function<String, Boolean> inputValidation) {
+        log.logRaw(ConsoleFormat.formatInputPrompt());
         boolean first = true;
 
         String line = null;
@@ -288,6 +289,7 @@ public static String readInput(Log log, Function<String, Boolean> inputValidatio
             while (!accepted) {
                 if (!first) {
                     log.error("Invalid input, please try again");
+                    log.logRaw(ConsoleFormat.formatInputPrompt());
                 }
                 first = false;