unified blocking and non-blocking prompt and added the "immediate" toggle to chose between both versions

Author: staxfur

cpp-terminal/prompt.cpp

@@ -5,10 +5,13 @@
 #include "private/conversion.hpp"
 #include "private/platform.hpp"
 
-Term::Result Term::prompt_blocking(const std::string& message,
+
+
+Term::Result Term::prompt(const std::string& message,
                                    const std::string& first_option,
                                    const std::string& second_option,
-                                   const std::string& prompt_indicator) {
+                                   const std::string& prompt_indicator,
+                                   bool immediate) {
     Terminal term(false, true, true);
     std::cout << message << " [" << first_option << '/' << second_option << ']'
               << prompt_indicator << ' ' << std::flush;
@@ -18,9 +21,32 @@ Term::Result Term::prompt_blocking(const std::string& message,
         return Result::ERROR;
     }
 
+    int key;
+    
+    if (immediate) {
+            while (true) {
+        key = Term::read_key();
+        if (key == 'y' || key == 'Y') {
+            Term::write("\n");
+            return Result::YES;
+        } else if (key == 'n' || key == 'N') {
+            Term::write("\n");
+            return Result::NO;
+        } else if (key == Term::Key::CTRL + 'c') {
+            Term::write("\n");
+            return Result::ABORT;
+        } else if (key == Term::Key::ENTER) {
+            Term::write("\n");
+            return Result::NONE;
+        } else {
+            Term::write("\n");
+            return Result::INVALID;
+        }
+    }
+    }
+    else {
     std::vector<char> input;
     unsigned short int length = 0;
-    int key;
     while (true) {
         key = Term::read_key();
         if (key >= 'a' && key <= 'z') {
@@ -61,47 +87,11 @@ Term::Result Term::prompt_blocking(const std::string& message,
             }
         }
     }
-    // should be unreachable
-    return Result::ERROR;
-}
-
-Term::Result Term::prompt_non_blocking(const std::string& message,
-                                       const std::string& first_option,
-                                       const std::string& second_option,
-                                       const std::string& prompt_indicator) {
-    Terminal term(false, true, true);
-    std::cout << message << " [" << first_option << '/' << second_option << ']'
-              << prompt_indicator << ' ' << std::flush;
-
-    if (!Term::is_stdin_a_tty()) {
-        Term::write("\n");
-        return Result::ERROR;
-    }
-
-    int key;
-    while (true) {
-        key = Term::read_key();
-        if (key == 'y' || key == 'Y') {
-            Term::write("\n");
-            return Result::YES;
-        } else if (key == 'n' || key == 'N') {
-            Term::write("\n");
-            return Result::NO;
-        } else if (key == Term::Key::CTRL + 'c') {
-            Term::write("\n");
-            return Result::ABORT;
-        } else if (key == Term::Key::ENTER) {
-            Term::write("\n");
-            return Result::NONE;
-        } else {
-            Term::write("\n");
-            return Result::INVALID;
-        }
     }
 }
 
-Term::Result_simple Term::prompt_simple(std::string message) {
-    switch (prompt_blocking(message, "Y", "N", ":")) {
+Term::Result_simple Term::prompt_simple(const std::string& message) {
+    switch (prompt(message, "Y", "N", ":", false)) {
         case Result::YES:
             return Result_simple::YES;
         case Result::ABORT:

cpp-terminal/prompt.hpp

@@ -23,23 +23,19 @@ enum class Result_simple { YES, NO, ABORT };
 
 // A simple yes/no prompt, requires the user to press the ENTER key to continue
 // The arguments are used like this: 1 [2/3]4 <user Input>
-Result prompt_blocking(const std::string& message,
+// the immediate switch indicates toggles wether pressing enter for 
+// confirming the input is required or not
+Result prompt(const std::string& message,
                        const std::string& first_option,
                        const std::string& second_option,
-                       const std::string& prompt_indicator);
-
-// A simple yes/no prompt, returns immediately after the first key press
-// The arguments are used like this: 1 [2/3]4 <user Input>
-Result prompt_non_blocking(const std::string& message,
-                           const std::string& first_option,
-                           const std::string& second_option,
-                           const std::string& prompt_indicator);
+                       const std::string& prompt_indicator,
+                       bool);
 
 // The most simple prompt possible, requires the user to press enter to continue
 // The arguments are used like this: 1 [y/N]:
 // Invalid input, errors (like no attached terminal) all result in 'no' as
 // default
-Result_simple prompt_simple(std::string message);
+Result_simple prompt_simple(const std::string& message);
 
 /* Multiline prompt */