perf: another impl to handle input exceptions for PiCLI

MaaXYZ · Jan 20, 2025 · f979aad · f979aad
1 parent 7869740
commit f979aad
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/source/MaaProjectInterface/CLI/main.cpp b/source/MaaProjectInterface/CLI/main.cpp
@@ -1,10 +1,26 @@
+#include <csignal>
+#include <format>
+#include <iostream>
+
 #include "Utils/Platform.h"
 #include "Utils/Runtime.h"
 
 #include "MaaToolkit/ProjectInterface/MaaToolkitProjectInterface.h"
 
+extern "C" void sig_handler(int sig)
+{
+    std::cout << std::format("\nsignal {} received, exit\n", sig);
+
+    exit(0);
+}
+
 int main(int argc, char** argv)
 {
+    std::signal(SIGTERM, sig_handler);
+    std::signal(SIGSEGV, sig_handler);
+    std::signal(SIGINT, sig_handler);
+    std::signal(SIGABRT, sig_handler);
+
     std::string user_path = MAA_NS::path_to_utf8_string(MAA_NS::library_dir());
     std::string resource_path = MAA_NS::path_to_utf8_string(MAA_NS::library_dir());
 

diff --git a/source/MaaToolkit/ProjectInterface/CLI/interactor.cpp b/source/MaaToolkit/ProjectInterface/CLI/interactor.cpp
@@ -31,7 +31,7 @@ std::vector<int> input_multi_impl(size_t size, std::string_view prompt)
         std::getline(std::cin, buffer);
 
         if (std::cin.eof()) {
-            throw InputEOF();
+            exit(0);
         }
 
         if (buffer.empty()) {

diff --git a/source/MaaToolkit/ProjectInterface/CLI/interactor.h b/source/MaaToolkit/ProjectInterface/CLI/interactor.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <exception>
-
 #include "MaaFramework/MaaDef.h"
 #include "ProjectInterface/Configurator.h"
 
@@ -56,8 +54,3 @@ 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,12 +44,7 @@ bool ProjectInterfaceMgr::run_cli(
         return interactor.run();
     }
 
-    try {
-        interactor.interact();
-    }
-    catch ([[maybe_unused]] const InputEOF& exc) {
-        std::cerr << "EOF detected, abort cli!";
-    }
+    interactor.interact();
     return true;
 }