feat: abort cli if EOF detected

fix #383
MaaXYZ · Jan 19, 2025 · 39177bd · 39177bd
1 parent ea66ca1
commit 39177bd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/source/MaaToolkit/ProjectInterface/CLI/interactor.cpp b/source/MaaToolkit/ProjectInterface/CLI/interactor.cpp
@@ -1,6 +1,7 @@
 #include "interactor.h"
 
 #include <algorithm>
+#include <exception>
 #include <format>
 #include <functional>
 #include <ranges>
@@ -30,6 +31,10 @@ std::vector<int> input_multi_impl(size_t size, std::string_view prompt)
         std::string buffer;
         std::getline(std::cin, buffer);
 
+        if (std::cin.eof()) {
+            throw InputEOF();
+        }
+
         if (buffer.empty()) {
             fail();
             continue;

diff --git a/source/MaaToolkit/ProjectInterface/CLI/interactor.h b/source/MaaToolkit/ProjectInterface/CLI/interactor.h
@@ -54,3 +54,8 @@ class Interactor
     std::map<std::string, MAA_PROJECT_INTERFACE_NS::CustomRecognitionSession> custom_recognitions_;
     std::map<std::string, MAA_PROJECT_INTERFACE_NS::CustomActionSession> custom_actions_;
 };
+
+struct InputEOF : public std::exception
+{
+    virtual const char* what() const override { return "EOF detected during input"; }
+};
diff --git a/source/MaaToolkit/ProjectInterface/ProjectInterfaceMgr.cpp b/source/MaaToolkit/ProjectInterface/ProjectInterfaceMgr.cpp
@@ -44,7 +44,12 @@ bool ProjectInterfaceMgr::run_cli(
         return interactor.run();
     }
 
-    interactor.interact();
+    try {
+        interactor.interact();
+    }
+    catch ([[maybe_unused]] const InputEOF& exc) {
+        std::cerr << "EOF detected, abort cli!";
+    }
     return true;
 }