Merge pull request #90 from TheFruxz/feature/consoleInputSyntaxIssue

Feature: syntaxIssue custom process
TheFruxz · Dec 4, 2021 · dec802d · dec802d
2 parents 0a634b7 + 9575461
commit dec802d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/JET-JVM/src/main/kotlin/de/jet/jvm/console/interchange/ConsoleInterchange.kt b/JET-JVM/src/main/kotlin/de/jet/jvm/console/interchange/ConsoleInterchange.kt
@@ -10,6 +10,7 @@ class ConsoleInterchange(
     override val path: String,
     override val branches: List<ConsoleStructureBranch>,
     override val content: ((parameters: List<String>) -> Unit)? = null,
+    val syntaxIssue: ((parameters: List<String>) -> Unit)? = null,
 ) : ConsoleInterchangeStructure<ConsoleStructureBranch>(identity) {
 
     fun performInterchange(input: String): Boolean {
@@ -33,6 +34,7 @@ class ConsoleInterchange(
         var path: String,
         var branches: MutableList<ConsoleStructureBranch> = mutableListOf(),
         var content: ((parameters: List<String>) -> Unit)? = null,
+        var syntaxIssue: ((parameters: List<String>) -> Unit)? = null,
     ) : Producible<ConsoleInterchange> {
 
         operator fun plus(branch: ConsoleStructureBranch) = apply {
@@ -47,6 +49,10 @@ class ConsoleInterchange(
             this.content = content
         }
 
+        fun onSyntaxIssue(syntaxIssue: ((parameters: List<String>) -> Unit)?) = apply {
+            this.syntaxIssue = syntaxIssue
+        }
+
         override fun produce() = ConsoleInterchange(
             identity, path, branches, content
         )

diff --git a/JET-JVM/src/main/kotlin/de/jet/jvm/extension/input/ConsoleInterchange.kt b/JET-JVM/src/main/kotlin/de/jet/jvm/extension/input/ConsoleInterchange.kt
@@ -43,9 +43,16 @@ fun requestTerminalInterchangeInput(vararg interchanges: ConsoleInterchange) {
         }
 
         if (call != null) {
+            val inputParameters = input.split(" ").drop(1)
+            if (!call.performInterchange(inputParameters.joinToString(" "))) {
+                val syntaxIssueReaction = call.syntaxIssue
+
+                if (syntaxIssueReaction != null) {
+                    syntaxIssueReaction(inputParameters)
+                } else {
+                    println("No response from interchange, seems that your input-syntax was wrong, try again!")
+                }
 
-            if (!call.performInterchange(input.split(" ").drop(1).joinToString(" "))) {
-                println("No response from interchange, seems that your input-syntax was wrong, try again!")
             }
 
         } else {