chore: missing rename

MaaXYZ · Dec 18, 2024 · f61e066 · f61e066
1 parent f8b5f29
commit f61e066
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 26 deletions.
diff --git a/docs/en_us/1.1-QuickStarted.md b/docs/en_us/1.1-QuickStarted.md
@@ -85,7 +85,7 @@ You can use low-code as a "wrapper" for invocation or register custom callbacks.
 # This is pseudo code, for reference only, and cannot be run directly
 # "Recognize and click the start button", "Recognize and click the confirmation icon" and so on are all logic in Json
 def main():
-    detail = tasker.post_pipeline("Recognize and click the start button").wait().get()
+    detail = tasker.post_task("Recognize and click the start button").wait().get()
 
     if detail.completed:
         tasker.controller.post_click(100, 100).wait()
@@ -95,7 +95,7 @@ def main():
         save_to_file(image)
 
         tasker.resource.register_custom_action("MyAction", MyAction())
-        tasker.post_pipeline("Recognize and click the confirmation icon").wait()
+        tasker.post_task("Recognize and click the confirmation icon").wait()
 
     image: np.ndarray = tasker.controller.post_screencap().wait().get()
 ```

diff --git a/docs/en_us/NodeJS/J1.1-QuickStarted.md b/docs/en_us/NodeJS/J1.1-QuickStarted.md
@@ -76,7 +76,7 @@ async function main() {
 
     // Launch task. Task1 is declared in pipeline/Task.json
     if (await tskr
-        .post_pipeline('Task1')
+        .post_task('Task1')
         .wait().success) {
         console.log('success!')
     }
@@ -87,7 +87,7 @@ main()
 
 ## Alter Resource Behavior on NodeJS Side
 
-Take a look at this code `await tskr.post_pipeline('task', 'Task1').wait()`
+Take a look at this code `await tskr.post_task('task', 'Task1').wait()`
 
 Function `post` can be called with three params. The third one is an object, which has exact the same structure to json in `pipeline`, and will override the original `pipeline`. Thus, you can pass an object here to control the task (even create new task).
 
@@ -97,7 +97,7 @@ Function `post` can be called with three params. The third one is an object, whi
 // 通过第三个参数, 创建了一个新的任务Task2, 然后执行它
 // 此处创建的任务仅在当前执行中有效
 await tskr
-    .post_pipeline('Task2', {
+    .post_task('Task2', {
         Task2: {
             next: [
                 'Task1'

diff --git a/docs/zh_cn/1.1-快速开始.md b/docs/zh_cn/1.1-快速开始.md
@@ -85,7 +85,7 @@ class MyAction(CustomAction):
 # 此处为伪代码，仅供参考思路，无法直接运行
 # "识别并点击开始按钮", "识别并点击确认图标" 等均为 Json 中的逻辑
 def main():
-    detail = tasker.post_pipeline("识别并点击开始按钮").wait().get()
+    detail = tasker.post_task("识别并点击开始按钮").wait().get()
 
     if detail.completed:
         tasker.controller.post_click(100, 100).wait()
@@ -95,7 +95,7 @@ def main():
         save_to_file(image)
 
         tasker.resource.register_custom_action("MyAction", MyAction())
-        tasker.post_pipeline("识别并点击确认图标").wait()
+        tasker.post_task("识别并点击确认图标").wait()
 
     image: np.ndarray = tasker.controller.post_screencap().wait().get()
 ```

diff --git a/docs/zh_cn/NodeJS/J1.1-快速开始.md b/docs/zh_cn/NodeJS/J1.1-快速开始.md
@@ -76,7 +76,7 @@ async function main() {
 
     // 执行任务, Task1定义在pipeline/Task.json
     if (await tskr
-        .post_pipeline('Task1')
+        .post_task('Task1')
         .wait().success) {
         console.log('success!')
     }
@@ -87,15 +87,15 @@ main()
 
 ## 在JS侧影响资源行为
 
-注意执行任务的这段代码`await tskr.post_pipeline('task', 'Task1').wait()`
+注意执行任务的这段代码`await tskr.post_task('task', 'Task1').wait()`
 
 `post`函数可以传入第三个参数, 该参数是一个对象, 其结构和`pipeline`下的json完全一致, 会覆盖在原有的`pipeline`之上. 因此, 可以通过在此处传入一个对象来实现控制任务(甚至创建新的任务).
 
 ```javascript
 // 通过第三个参数, 创建了一个新的任务Task2, 然后执行它
 // 此处创建的任务仅在当前执行中有效
 await tskr
-    .post_pipeline('Task2', {
+    .post_task('Task2', {
         Task2: {
             next: [
                 'Task1'

diff --git a/sample/nodejs/main.ts b/sample/nodejs/main.ts
@@ -76,7 +76,7 @@ async function main() {
 
     res.register_custom_recognizer('MyRec', my_reco)
 
-    let task_detail = await tskr.post_pipeline('StartUpAndClickButton').wait().get()
+    let task_detail = await tskr.post_task('StartUpAndClickButton').wait().get()
 
     tskr.destroy()
     ctrl.destroy()

diff --git a/sample/python/__main__.py b/sample/python/__main__.py
@@ -43,7 +43,7 @@ def main():
 
     resource.register_custom_recognition("MyRec", MyRecongition())
 
-    task_detail = tasker.post_pipeline("StartUpAndClickButton").wait().get()
+    task_detail = tasker.post_task("StartUpAndClickButton").wait().get()
     # do something with task_detail
 
 

diff --git a/source/MaaFramework/API/MaaTasker.cpp b/source/MaaFramework/API/MaaTasker.cpp
@@ -89,7 +89,7 @@ MaaTaskId MaaTaskerPostTask(MaaTasker* tasker, const char* entry, const char* pi
         return MaaInvalidId;
     }
 
-    return tasker->post_pipeline(entry, ov_opt->as_object());
+    return tasker->post_task(entry, ov_opt->as_object());
 }
 
 MaaStatus MaaTaskerStatus(const MaaTasker* tasker, MaaTaskId id)

diff --git a/source/MaaFramework/API/MaaTypes.h b/source/MaaFramework/API/MaaTypes.h
@@ -77,7 +77,7 @@ struct MaaTasker
 
     virtual bool set_option(MaaTaskerOption key, MaaOptionValue value, MaaOptionValueSize val_size) = 0;
 
-    virtual MaaTaskId post_pipeline(const std::string& entry, const json::object& pipeline_override) = 0;
+    virtual MaaTaskId post_task(const std::string& entry, const json::object& pipeline_override) = 0;
 
     virtual MaaStatus status(MaaTaskId task_id) const = 0;
     virtual MaaStatus wait(MaaTaskId task_id) const = 0;

diff --git a/source/MaaFramework/Tasker/Tasker.cpp b/source/MaaFramework/Tasker/Tasker.cpp
@@ -69,7 +69,7 @@ bool Tasker::set_option(MaaTaskerOption key, MaaOptionValue value, MaaOptionValu
     return false;
 }
 
-MaaTaskId Tasker::post_pipeline(const std::string& entry, const json::object& pipeline_override)
+MaaTaskId Tasker::post_task(const std::string& entry, const json::object& pipeline_override)
 {
     LogInfo << VAR(entry) << VAR(pipeline_override);
 

diff --git a/source/MaaFramework/Tasker/Tasker.h b/source/MaaFramework/Tasker/Tasker.h
@@ -30,7 +30,7 @@ class Tasker : public MaaTasker
 
     virtual bool set_option(MaaTaskerOption key, MaaOptionValue value, MaaOptionValueSize val_size) override;
 
-    virtual MaaTaskId post_pipeline(const std::string& entry, const json::object& pipeline_override) override;
+    virtual MaaTaskId post_task(const std::string& entry, const json::object& pipeline_override) override;
 
     virtual MaaStatus status(MaaTaskId task_id) const override;
     virtual MaaStatus wait(MaaTaskId task_id) const override;

diff --git a/source/binding/NodeJS/release/maa-node/src/maa.d.ts b/source/binding/NodeJS/release/maa-node/src/maa.d.ts
@@ -244,7 +244,7 @@ export declare function tasker_bind_controller(
     controller: ControllerHandle | null
 ): boolean
 export declare function tasker_inited(handle: TaskerHandle): boolean
-export declare function tasker_post_pipeline(
+export declare function tasker_post_task(
     handle: TaskerHandle,
     entry: string,
     pipeline_override: string

diff --git a/source/binding/NodeJS/release/maa-node/src/tasker.ts b/source/binding/NodeJS/release/maa-node/src/tasker.ts
@@ -117,11 +117,11 @@ export class TaskerBase {
         }
     }
 
-    post_pipeline(entry: string, param: Record<string, unknown> = {}) {
+    post_task(entry: string, param: Record<string, unknown> = {}) {
         return new TaskJob(
             this,
             this.#source,
-            maa.tasker_post_pipeline(this.handle, entry, JSON.stringify(param))
+            maa.tasker_post_task(this.handle, entry, JSON.stringify(param))
         )
     }
 

diff --git a/source/binding/NodeJS/src/instance/tasker.cpp b/source/binding/NodeJS/src/instance/tasker.cpp
@@ -85,7 +85,7 @@ bool tasker_inited(Napi::External<TaskerInfo> info)
     return MaaTaskerInited(info.Data()->handle);
 }
 
-MaaTaskId tasker_post_pipeline(Napi::External<TaskerInfo> info, std::string entry, std::string overr)
+MaaTaskId tasker_post_task(Napi::External<TaskerInfo> info, std::string entry, std::string overr)
 {
     return MaaTaskerPostTask(info.Data()->handle, entry.c_str(), overr.c_str());
 }
@@ -208,7 +208,7 @@ void load_instance_tasker(Napi::Env env, Napi::Object& exports, Napi::External<E
     BIND(tasker_bind_resource);
     BIND(tasker_bind_controller);
     BIND(tasker_inited);
-    BIND(tasker_post_pipeline);
+    BIND(tasker_post_task);
     BIND(tasker_status);
     BIND(tasker_wait);
     BIND(tasker_running);

diff --git a/source/binding/Python/maa/tasker.py b/source/binding/Python/maa/tasker.py
@@ -74,7 +74,7 @@ def controller(self) -> Controller:
     def inited(self) -> bool:
         return bool(Library.framework.MaaTaskerInited(self._handle))
 
-    def post_pipeline(self, entry: str, pipeline_override: Dict = {}) -> JobWithResult:
+    def post_task(self, entry: str, pipeline_override: Dict = {}) -> JobWithResult:
         taskid = Library.framework.MaaTaskerPostTask(
             self._handle,
             *Tasker._gen_post_param(entry, pipeline_override),

diff --git a/test/nodejs/binding.ts b/test/nodejs/binding.ts
@@ -141,7 +141,7 @@ async function api_test() {
         }
     }
 
-    let detail = await tasker.post_pipeline('Entry', ppover).wait().get()
+    let detail = await tasker.post_task('Entry', ppover).wait().get()
     if (!detail) {
         console.log('pipeline failed')
         process.exit(1)

diff --git a/test/python/binding_test.py b/test/python/binding_test.py
@@ -122,7 +122,7 @@ def api_test():
     r2.post_bundle("C:/_maafw_testing_/aaabbbccc").wait()
     t1 = Tasker()
     t2 = Tasker()
-    t2.post_pipeline("Entry", {}).wait()
+    t2.post_task("Entry", {}).wait()
 
     resource = Resource(MyNotificationHandler())
     print(f"resource: {resource}")
@@ -158,14 +158,14 @@ def api_test():
         },
     }
 
-    detail = tasker.post_pipeline("Entry", ppover).wait().get()
+    detail = tasker.post_task("Entry", ppover).wait().get()
     if detail:
         print(f"pipeline detail: {detail}")
     else:
         print("pipeline failed")
         raise RuntimeError("pipeline failed")
 
-    tasker.post_pipeline("Entry", ppover)
+    tasker.post_task("Entry", ppover)
     stopped = tasker.post_stop().wait().succeeded
     if not stopped:
         raise RuntimeError("post_stop failed")