refactor: MaaToolkitInitOptionConfig

Author: MistEO

include/MaaFramework/Instance/MaaInstance.h

@@ -197,7 +197,7 @@ extern "C"
      */
     MAA_FRAMEWORK_API MaaStatus MaaWaitTask(MaaInstanceHandle inst, MaaTaskId id);
 
-    /// \deprecated Use MaaRunning() instead.
+    /// \deprecated Use !MaaRunning() instead.
     MAA_DEPRECATED MAA_FRAMEWORK_API MaaBool MaaTaskAllFinished(MaaInstanceHandle inst);
 
     /**

include/MaaToolkit/Config/MaaToolkitConfig.h

@@ -16,8 +16,13 @@ extern "C"
 {
 #endif
 
-    MAA_TOOLKIT_API MaaBool MaaToolkitInit();
-    MAA_TOOLKIT_API MaaBool MaaToolkitUninit();
+    MAA_TOOLKIT_API MaaBool
+        MaaToolkitInitOptionConfig(MaaStringView user_path, MaaStringView default_json);
+
+    /// \deprecated Use MaaToolkitInitOptionConfig instead.
+    MAA_DEPRECATED MAA_TOOLKIT_API MaaBool MaaToolkitInit();
+    /// \deprecated Don't use it.
+    MAA_DEPRECATED MAA_TOOLKIT_API MaaBool MaaToolkitUninit();
 
 #ifdef __cplusplus
 }

sample/cpp/main.cpp

@@ -23,7 +23,7 @@ void register_my_action_by_exec_agent(MaaInstanceHandle maa_handle);
 
 int main([[maybe_unused]] int argc, char** argv)
 {
-    MaaToolkitInit();
+    MaaToolkitInitOptionConfig("~/.maafw", "{}");
 
     auto controller_handle = create_adb_controller();
     // auto controller_handle = create_win32_controller();
@@ -44,7 +44,6 @@ int main([[maybe_unused]] int argc, char** argv)
         MaaDestroy(maa_handle);
         MaaResourceDestroy(resource_handle);
         MaaControllerDestroy(controller_handle);
-        MaaToolkitUninit();
     };
 
     if (!MaaInited(maa_handle)) {
@@ -153,4 +152,4 @@ void register_my_action_by_exec_agent(MaaInstanceHandle maa_handle)
         "MyAct",
         "Python.exe",
         R"(["sample\\python\\exec_agent\\my_action.py"])");
-}
+}

sample/python/__main__.py

@@ -16,7 +16,7 @@ async def main():
     version = Library.open("bin")
     print(f"MaaFw Version: {version}")
 
-    Toolkit.init_config()
+    Toolkit.init_option("~/.maafw");
 
     resource = Resource()
     await resource.load("sample/resource")

source/MaaFramework/API/MaaInstance.cpp

@@ -200,6 +200,8 @@ MaaStatus MaaWaitTask(MaaInstanceHandle inst, MaaTaskId id)
 
 MaaBool MaaTaskAllFinished(MaaInstanceHandle inst)
 {
+    LogWarn << __FUNCTION__ << "is deprecated, use !MaaRunning instead.";
+
     return !MaaRunning(inst);
 }
 

source/MaaProjectInterface/CLI/main.cpp

@@ -8,7 +8,9 @@
 
 int main(int argc, char** argv)
 {
-    MaaToolkitInit();
+    std::string user_path = MAA_NS::path_to_utf8_string(MAA_NS::library_dir());
+
+    MaaToolkitInitOptionConfig(user_path.c_str(), "{}");
 
     Interactor interactor;
 
@@ -34,4 +36,4 @@ int main(int argc, char** argv)
 
     interactor.interact();
     return 0;
-}
+}

source/MaaToolkit/API/MaaToolkitConfig.cpp

@@ -1,20 +1,37 @@
 #include "MaaToolkit/MaaToolkitAPI.h"
 
-#include "Config/ConfigMgr.h"
+#include <meojson/json.hpp>
+
+#include "Config/GlobalOptionConfig.h"
 #include "Utils/Logger.h"
+#include "Utils/Runtime.h"
+
+MaaBool MaaToolkitInitOptionConfig(MaaStringView user_path, MaaStringView default_json)
+{
+    LogInfo << VAR(user_path) << VAR(default_json);
 
-static MaaToolkitConfigMgrAPI& config_mgr = MAA_TOOLKIT_NS::ConfigMgr::get_instance();
+    auto json_opt = json::parse(default_json);
+    if (!json_opt) {
+        LogError << "failed to parse json" << default_json;
+        return false;
+    }
+
+    auto& config = MAA_TOOLKIT_NS::GlobalOptionConfig::get_instance();
+    return config.init(MAA_NS::path(user_path), *json_opt);
+}
 
 MaaBool MaaToolkitInit()
 {
-    LogFunc;
+    LogWarn << __FUNCTION__ << "is deprecated, use MaaToolkitInitPolicy instead.";
+
+    std::string user_path = MAA_NS::path_to_utf8_string(MAA_NS::library_dir());
 
-    return config_mgr.init();
+    return MaaToolkitInitOptionConfig(user_path.c_str(), "{}");
 }
 
 MaaBool MaaToolkitUninit()
 {
-    LogFunc;
+    LogWarn << __FUNCTION__ << "is deprecated, don't use it.";
 
-    return config_mgr.uninit();
-}
+    return true;
+}