refactor: 重构ProjectInterface项目结构

Author: MistEO

source/MaaProjectInterfaceCli/interactor.cpp

@@ -4,6 +4,7 @@
 #include <unordered_set>
 
 #include "MaaToolkit/Device/MaaToolkitDevice.h"
+#include "ProjectInterface/Runner.h"
 #include "Utils/Logger.h"
 #include "Utils/Platform.h"
 
@@ -53,11 +54,13 @@ bool Interactor::load(const std::filesystem::path& project_dir)
     LogFunc << VAR(project_dir);
 
     if (!config_.load(project_dir)) {
+        mpause();
         return false;
     }
 
     if (!config_.check_configuration()) {
         std::cout << "### The interface has changed and incompatible configurations have been deleted. ###\n\n";
+        mpause();
     }
 
     return true;
@@ -72,16 +75,32 @@ void Interactor::interact()
 
     while (true) {
         print_config();
-        if (interact_once()) {
+        if (!interact_once()) {
             break;
         }
         config_.save();
     }
 }
 
-std::optional<MAA_PROJECT_INTERFACE_NS::RuntimeParam> Interactor::generate_runtime() const
+bool Interactor::run()
 {
-    return config_.generate_runtime();
+    auto runtime = config_.generate_runtime();
+    if (!runtime) {
+        LogError << "Failed to generate runtime";
+        return false;
+    }
+
+    bool ret = MAA_PROJECT_INTERFACE_NS::Runner::run(runtime.value(), on_maafw_notify, this);
+
+    if (!ret) {
+        std::cout << "### Failed to run tasks ###\n\n";
+    }
+    else {
+        std::cout << "### All tasks have been completed ###\n\n";
+    }
+
+    mpause();
+    return ret;
 }
 
 void Interactor::print_config() const
@@ -108,11 +127,12 @@ void Interactor::print_config() const
 void Interactor::welcome() const
 {
     if (config_.interface_data().message.empty()) {
-        std::cout << "Welcome to use Maa Project Interface CLI!\n\n";
+        std::cout << "Welcome to use Maa Project Interface CLI!\n";
     }
     else {
-        std::cout << MaaNS::utf8_to_crt(config_.interface_data().message) << "\n\n";
+        std::cout << MaaNS::utf8_to_crt(config_.interface_data().message) << "\n";
     }
+    std::cout << "MaaFramework: " << MAA_VERSION << "\n\n";
 
     std::cout << "Version: " << MaaNS::utf8_to_crt(config_.interface_data().version) << "\n\n";
 }
@@ -126,9 +146,10 @@ bool Interactor::interact_once()
     std::cout << "\t4. Move task\n";
     std::cout << "\t5. Delete task\n";
     std::cout << "\t6. Run tasks\n";
+    std::cout << "\t7. Exit\n";
     std::cout << "\n";
 
-    int action = input(6);
+    int action = input(7);
 
     switch (action) {
     case 1:
@@ -147,10 +168,13 @@ bool Interactor::interact_once()
         delete_task();
         break;
     case 6:
-        return true;
+        run();
+        break;
+    case 7:
+        return false;
     }
 
-    return false;
+    return true;
 }
 
 void Interactor::select_controller()
@@ -394,3 +418,19 @@ void Interactor::print_config_tasks(bool with_index) const
     }
     std::cout << "\n";
 }
+
+void Interactor::mpause() const
+{
+    std::cout << "\nPress Enter to continue...";
+    std::cin.sync();
+    std::cin.get();
+}
+
+void Interactor::on_maafw_notify(MaaStringView msg, MaaStringView details_json, MaaTransparentArg callback_arg)
+{
+    Interactor* pthis = static_cast<Interactor*>(callback_arg);
+    std::ignore = pthis;
+
+    std::string entry = json::parse(details_json).value_or(json::value())["entry"].as_string();
+    std::cout << MaaNS::utf8_to_crt(std::format("on_maafw_notify: {} {}", msg, entry)) << std::endl;
+}

source/MaaProjectInterfaceCli/interactor.h

@@ -1,14 +1,14 @@
 #pragma once
 
-#include "configurator.h"
+#include "ProjectInterface/configurator.h"
 
 class Interactor
 {
 public:
     bool load(const std::filesystem::path& project_dir);
     void print_config() const;
     void interact();
-    std::optional<MAA_PROJECT_INTERFACE_NS::RuntimeParam> generate_runtime() const;
+    bool run();
 
 private:
     void interact_for_first_time_use();
@@ -29,6 +29,10 @@ class Interactor
 
     void print_config_tasks(bool with_index = true) const;
 
+    void mpause() const;
+
+    static void on_maafw_notify(MaaStringView msg, MaaStringView details_json, MaaTransparentArg callback_arg);
+
 private:
-    Configurator config_;
+    MAA_PROJECT_INTERFACE_NS::Configurator config_;
 };

source/MaaProjectInterfaceCli/main.cpp

@@ -2,18 +2,9 @@
 #include <iostream>
 
 #include "MaaToolkit/MaaToolkitAPI.h"
-#include "Utils/Platform.h"
 #include "Utils/Runtime.h"
 
 #include "interactor.h"
-#include "runner.h"
-
-void mpause()
-{
-    std::cout << "\nPress Enter to continue...";
-    std::cin.sync();
-    std::cin.get();
-}
 
 int main(int argc, char** argv)
 {
@@ -22,7 +13,6 @@ int main(int argc, char** argv)
     Interactor interactor;
 
     if (!interactor.load(MAA_NS::library_dir())) {
-        mpause();
         return -1;
     }
 
@@ -37,23 +27,10 @@ int main(int argc, char** argv)
 
     if (direct) {
         interactor.print_config();
-    }
-    else {
-        interactor.interact();
-    }
-
-    auto runtime_opt = interactor.generate_runtime();
-    if (!runtime_opt) {
-        mpause();
-        return -1;
-    }
-
-    bool ret = Runner::run(*runtime_opt);
-    if (!ret) {
-        mpause();
-        return -1;
+        bool ret = interactor.run();
+        return ret ? 0 : -1;
     }
 
-    mpause();
+    interactor.interact();
     return 0;
 }

source/MaaProjectInterfaceCli/runner.h

@@ -1,4 +1,4 @@
-#include "configurator.h"
+#include "ProjectInterface/Configurator.h"
 
 #include <ranges>
 

source/MaaProjectInterfaceCli/configurator.cpp source/ProjectInterface/Configurator.cpp

@@ -1,4 +1,4 @@
-#include "runner.h"
+#include "ProjectInterface/Runner.h"
 
 #include <format>
 #include <iostream>
@@ -10,14 +10,20 @@
 
 #include "Utils/ScopeLeave.hpp"
 
-bool Runner::run(const MAA_PROJECT_INTERFACE_NS::RuntimeParam& param)
+MAA_PROJECT_INTERFACE_NS_BEGIN
+
+bool Runner::run(const MAA_PROJECT_INTERFACE_NS::RuntimeParam& param, //
+                 MaaInstanceCallback callback, MaaCallbackTransparentArg callback_arg,
+                 MaaResourceCallback resource_callback, MaaCallbackTransparentArg resource_callback_arg,
+                 MaaControllerCallback controller_callback, MaaCallbackTransparentArg controller_callback_arg)
 {
-    auto maa_handle = MaaCreate(&Runner::on_maafw_notify, nullptr);
+    auto maa_handle = MaaCreate(callback, callback_arg);
 
-    auto controller_handle = MaaAdbControllerCreateV2(param.adb_param.adb_path.c_str(), param.adb_param.address.c_str(),
-                                                      param.adb_param.controller_type, param.adb_param.config.c_str(),
-                                                      param.adb_param.agent_path.c_str(), nullptr, nullptr);
-    auto resource_handle = MaaResourceCreate(nullptr, nullptr);
+    auto controller_handle =
+        MaaAdbControllerCreateV2(param.adb_param.adb_path.c_str(), param.adb_param.address.c_str(),
+                                 param.adb_param.controller_type, param.adb_param.config.c_str(),
+                                 param.adb_param.agent_path.c_str(), controller_callback, controller_callback_arg);
+    auto resource_handle = MaaResourceCreate(resource_callback, resource_callback_arg);
 
     int64_t cid = MaaControllerPostConnection(controller_handle);
     int64_t rid = 0;
@@ -68,10 +74,4 @@ bool Runner::run(const MAA_PROJECT_INTERFACE_NS::RuntimeParam& param)
     return true;
 }
 
-void Runner::on_maafw_notify(MaaStringView msg, MaaStringView details_json, MaaTransparentArg callback_arg)
-{
-    std::ignore = callback_arg;
-
-    std::string entry = json::parse(details_json).value_or(json::value())["entry"].as_string();
-    std::cout << std::format("on_maafw_notify: {} {}", msg, entry) << std::endl;
-}
+MAA_PROJECT_INTERFACE_NS_END

source/ProjectInterface/Parser/Parser.cpp source/ProjectInterface/Parser.cpp

@@ -3,7 +3,9 @@
 #include <filesystem>
 #include <string_view>
 
-#include "ProjectInterface/Types.h"
+#include "Types.h"
+
+MAA_PROJECT_INTERFACE_NS_BEGIN
 
 class Configurator
 {
@@ -34,3 +36,5 @@ class Configurator
     bool first_time_use_ = false;
     MAA_PROJECT_INTERFACE_NS::Configuration config_;
 };
+
+MAA_PROJECT_INTERFACE_NS_END

source/MaaProjectInterfaceCli/runner.cpp source/ProjectInterface/Runner.cpp

@@ -0,0 +1,20 @@
+#pragma once
+
+#include "Types.h"
+
+#include "MaaFramework/MaaDef.h"
+
+MAA_PROJECT_INTERFACE_NS_BEGIN
+
+class Runner
+{
+public:
+    static bool run(const MAA_PROJECT_INTERFACE_NS::RuntimeParam& param, //
+                    MaaInstanceCallback callback = nullptr, MaaCallbackTransparentArg callback_arg = nullptr,
+                    MaaResourceCallback resource_callback = nullptr,
+                    MaaCallbackTransparentArg resource_callback_arg = nullptr,
+                    MaaControllerCallback controller_callback = nullptr,
+                    MaaCallbackTransparentArg controller_callback_arg = nullptr);
+};
+
+MAA_PROJECT_INTERFACE_NS_END