feat: basic impl cli

MaaXYZ · Aug 29, 2024 · a48ca93 · a48ca93
1 parent 88318e0
commit a48ca93
Show file tree

Hide file tree

Showing 17 changed files with 658 additions and 52 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -17,7 +17,7 @@
             "MIMode": "lldb"
         },
         {
-            "name": "Pi sample",
+            "name": "MaaPICli",
             "type": "cppdbg",
             "request": "launch",
             "program": "${workspaceFolder}/build/bin/Debug/sample_pi",
@@ -28,6 +28,17 @@
             "externalConsole": false,
             "MIMode": "lldb"
         },
+        {
+            "name": "MaaPICli - Win",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/build/bin/Debug/MaaPICli.exe",
+            "args": ["."],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}/sample",
+            "environment": [],
+            "console": "externalTerminal"
+        },
         {
             "type": "lldb",
             "request": "launch",

diff --git a/include/MaaPI/MaaPIAPI.h b/include/MaaPI/MaaPIAPI.h
@@ -22,7 +22,8 @@ extern "C"
     MAA_PI_API MaaController* MaaPIRuntimeGetController(MaaPIRuntime* rt);
     MAA_PI_API MaaResource* MaaPIRuntimeGetResource(MaaPIRuntime* rt);
     MAA_PI_API MaaTasker* MaaPIRuntimeGetTasker(MaaPIRuntime* rt);
-    MAA_PI_API MaaBool MaaPIRuntimeSetup(MaaPIRuntime* rt, MaaPIData* data, MaaPIConfig* cfg, MaaNotificationCallback cb, void* cb_arg);
+    MAA_PI_API MaaBool MaaPIRuntimeBind(MaaPIRuntime* rt, MaaPIData* data, MaaPIConfig* cfg);
+    MAA_PI_API MaaBool MaaPIRuntimeSetup(MaaPIRuntime* rt, MaaNotificationCallback cb, void* cb_arg);
 
     MAA_PI_API MaaPIClient* MaaPIClientCreate(const char* locale, MaaPIClientHandler handler, void* handler_arg);
     MAA_PI_API void MaaPIClientDestroy(MaaPIClient* client);

diff --git a/sample/.gitignore b/sample/.gitignore
@@ -1 +1,3 @@
 config.json
+pi_config.json
+maa_option.json
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -15,7 +15,6 @@ endif()
 add_subdirectory(LibraryHolder)
 add_subdirectory(MaaFramework)
 add_subdirectory(MaaToolkit)
-add_subdirectory(MaaProjectInterface)
 add_subdirectory(MaaPI)
 
 add_subdirectory(binding)
diff --git a/source/MaaPI/API/MaaPi.cpp b/source/MaaPI/API/MaaPi.cpp
@@ -106,13 +106,22 @@ MaaTasker* MaaPIRuntimeGetTasker(MaaPIRuntime* rt)
     return rt->get_tasker();
 }
 
-MaaBool MaaPIRuntimeSetup(MaaPIRuntime* rt, MaaPIData* data, MaaPIConfig* cfg, MaaNotificationCallback cb, void* cb_arg)
+MaaBool MaaPIRuntimeBind(MaaPIRuntime* rt, MaaPIData* data, MaaPIConfig* cfg)
 {
     if (!rt || !data || !cfg) {
         return false;
     }
 
-    return rt->setup(data, cfg, cb, cb_arg);
+    return rt->bind(data, cfg);
+}
+
+MaaBool MaaPIRuntimeSetup(MaaPIRuntime* rt, MaaNotificationCallback cb, void* cb_arg)
+{
+    if (!rt) {
+        return false;
+    }
+
+    return rt->setup(cb, cb_arg);
 }
 
 MaaPIClient* MaaPIClientCreate(const char* locale, MaaPIClientHandler handler, void* handler_arg)

diff --git a/source/MaaPI/CLI/CMakeLists.txt b/source/MaaPI/CLI/CMakeLists.txt
@@ -1,2 +1,4 @@
-add_executable(MaaPICli main.cpp)
-target_link_libraries(MaaPICli MaaPI HeaderOnlyLibraries)
+add_executable(MaaPICli main.cpp interactor.cpp)
+target_link_libraries(MaaPICli MaaPI MaaUtils HeaderOnlyLibraries)
+
+target_include_directories(MaaPICli PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MAA_PRIVATE_INC} ${MAA_PUBLIC_INC})