refactor: get_task_list -> get_node_list

@binding-developers
MaaXYZ · Jan 15, 2025 · 1959a79 · 1959a79 · MistEO · Jan 15, 2025
1 parent 43cfccb
commit 1959a79
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git a/include/MaaFramework/Instance/MaaResource.h b/include/MaaFramework/Instance/MaaResource.h
@@ -51,7 +51,7 @@ extern "C"
 
     MAA_FRAMEWORK_API MaaBool MaaResourceGetHash(const MaaResource* res, /* out */ MaaStringBuffer* buffer);
 
-    MAA_FRAMEWORK_API MaaBool MaaResourceGetTaskList(const MaaResource* res, /* out */ MaaStringListBuffer* buffer);
+    MAA_FRAMEWORK_API MaaBool MaaResourceGetNodeList(const MaaResource* res, /* out */ MaaStringListBuffer* buffer);
 
 #ifdef __cplusplus
 }

diff --git a/source/MaaFramework/API/MaaResource.cpp b/source/MaaFramework/API/MaaResource.cpp
@@ -193,14 +193,14 @@ MaaBool MaaResourceGetHash(const MaaResource* res, MaaStringBuffer* buffer)
     return true;
 }
 
-MaaBool MaaResourceGetTaskList(const MaaResource* res, /* out */ MaaStringListBuffer* buffer)
+MaaBool MaaResourceGetNodeList(const MaaResource* res, /* out */ MaaStringListBuffer* buffer)
 {
     if (!res || !buffer) {
         LogError << "handle is null";
         return false;
     }
 
-    auto list = res->get_task_list();
+    auto list = res->get_node_list();
 
     buffer->clear();
 

diff --git a/source/MaaFramework/API/MaaTypes.h b/source/MaaFramework/API/MaaTypes.h
@@ -34,7 +34,7 @@ struct MaaResource
     virtual void clear_custom_action() = 0;
 
     virtual std::string get_hash() const = 0;
-    virtual std::vector<std::string> get_task_list() const = 0;
+    virtual std::vector<std::string> get_node_list() const = 0;
 };
 
 struct MaaController
@@ -102,8 +102,11 @@ struct MaaContext
 
     virtual MaaTaskId run_task(const std::string& entry, const json::object& pipeline_override) = 0;
     virtual MaaRecoId run_recognition(const std::string& entry, const json::object& pipeline_override, const cv::Mat& image) = 0;
-    virtual MaaNodeId
-        run_action(const std::string& entry, const json::object& pipeline_override, const cv::Rect& box, const std::string& reco_detail) = 0;
+    virtual MaaNodeId run_action(
+        const std::string& entry,
+        const json::object& pipeline_override,
+        const cv::Rect& box,
+        const std::string& reco_detail) = 0;
     virtual bool override_pipeline(const json::object& pipeline_override) = 0;
     virtual bool override_next(const std::string& node_name, const std::vector<std::string>& next) = 0;
 

diff --git a/source/MaaFramework/Resource/PipelineResMgr.cpp b/source/MaaFramework/Resource/PipelineResMgr.cpp
@@ -185,7 +185,7 @@ bool PipelineResMgr::check_next_list(const PipelineData::NextList& next_list, co
     return true;
 }
 
-std::vector<std::string> PipelineResMgr::get_task_list() const
+std::vector<std::string> PipelineResMgr::get_node_list() const
 {
     auto k = pipeline_data_map_ | std::views::keys;
     return std::vector(k.begin(), k.end());

diff --git a/source/MaaFramework/Resource/PipelineResMgr.h b/source/MaaFramework/Resource/PipelineResMgr.h
@@ -27,7 +27,7 @@ class PipelineResMgr : public NonCopyable
 
     const PipelineDataMap& get_pipeline_data_map() const { return pipeline_data_map_; }
 
-    std::vector<std::string> get_task_list() const;
+    std::vector<std::string> get_node_list() const;
 
 public:
     static bool parse_task(

diff --git a/source/MaaFramework/Resource/ResourceMgr.cpp b/source/MaaFramework/Resource/ResourceMgr.cpp
@@ -106,9 +106,9 @@ std::string ResourceMgr::get_hash() const
     return hash_cache_;
 }
 
-std::vector<std::string> ResourceMgr::get_task_list() const
+std::vector<std::string> ResourceMgr::get_node_list() const
 {
-    return pipeline_res_.get_task_list();
+    return pipeline_res_.get_node_list();
 }
 
 void ResourceMgr::post_stop()

diff --git a/source/MaaFramework/Resource/ResourceMgr.h b/source/MaaFramework/Resource/ResourceMgr.h
@@ -51,7 +51,7 @@ class ResourceMgr : public MaaResource
     virtual void clear_custom_action() override;
 
     virtual std::string get_hash() const override;
-    virtual std::vector<std::string> get_task_list() const override;
+    virtual std::vector<std::string> get_node_list() const override;
 
 public:
     void post_stop();

diff --git a/source/binding/NodeJS/src/instance/resource.cpp b/source/binding/NodeJS/src/instance/resource.cpp
@@ -166,7 +166,7 @@ std::optional<std::string> resource_get_hash(Napi::External<ResourceInfo> info)
 std::optional<std::vector<std::string>> resource_get_task_list(Napi::External<ResourceInfo> info)
 {
     StringListBuffer buffer;
-    auto ret = MaaResourceGetTaskList(info.Data()->handle, buffer);
+    auto ret = MaaResourceGetNodeList(info.Data()->handle, buffer);
     if (ret) {
         return buffer.as_vector([](StringBufferRefer buf) { return buf.str(); });
     }