fix: 单次 Load 不再允许同名 task

fix #63

source/MaaFramework/Resource/PipelineResMgr.cpp

@@ -15,12 +15,20 @@ bool PipelineResMgr::load(const std::filesystem::path& path, bool is_base)
     if (is_base) {
         clear();
     }
+
     paths_.emplace_back(path);
 
-    bool loaded = load_all_json(path);
-    loaded &= check_all_next_list();
+    if (!load_all_json(path)) {
+        LogError << "load_all_json failed" << VAR(path);
+        return false;
+    }
 
-    return loaded;
+    if (!check_all_next_list()) {
+        LogError << "check_all_next_list failed" << VAR(path);
+        return false;
+    }
+
+    return true;
 }
 
 void PipelineResMgr::clear()
@@ -50,36 +58,45 @@ bool PipelineResMgr::load_all_json(const std::filesystem::path& path)
         return false;
     }
 
-    bool loaded = false;
     if (!std::filesystem::is_directory(path)) {
         LogError << "path is not directory" << VAR(path);
         return false;
     }
 
+    bool loaded = false;
+
+    std::set<std::string> existing_keys;
     for (auto& entry : std::filesystem::recursive_directory_iterator(path)) {
         auto& entry_path = entry.path();
+        if (entry.is_directory()) {
+            LogDebug << "entry is directory" << VAR(entry_path);
+            continue;
+        }
         if (!entry.is_regular_file()) {
             LogWarn << "entry is not regular file, skip" << VAR(entry_path);
             continue;
         }
+
         auto ext = path_to_utf8_string(entry_path.extension());
         tolowers_(ext);
         if (ext != ".json") {
             LogWarn << "entry is not *.json, skip" << VAR(entry_path) << VAR(ext);
             continue;
         }
 
-        loaded &= open_and_parse_file(entry_path);
-        if (!loaded) {
+        bool parsed = open_and_parse_file(entry_path, existing_keys);
+        if (!parsed) {
             LogError << "open_and_parse_file failed" << VAR(entry_path);
             return false;
         }
+
+        loaded = true;
     }
 
     return loaded;
 }
 
-bool PipelineResMgr::open_and_parse_file(const std::filesystem::path& path)
+bool PipelineResMgr::open_and_parse_file(const std::filesystem::path& path, std::set<std::string>& existing_keys)
 {
     LogFunc << VAR(path);
 
@@ -88,9 +105,11 @@ bool PipelineResMgr::open_and_parse_file(const std::filesystem::path& path)
         LogError << "json::open failed" << VAR(path);
         return false;
     }
+    const auto& json = *json_opt;
 
     TaskDataMap cur_data_map;
-    if (!parse_config(*json_opt, cur_data_map, task_data_map_)) {
+    if (!parse_config(json, cur_data_map, existing_keys, task_data_map_)) {
+        LogError << "parse_config failed" << VAR(path) << VAR(json);
         return false;
     }
 
@@ -126,7 +145,8 @@ bool PipelineResMgr::check_next_list(const TaskData::NextList& next_list) const
     return true;
 }
 
-bool PipelineResMgr::parse_config(const json::value& input, TaskDataMap& output, const TaskDataMap& default_value)
+bool PipelineResMgr::parse_config(const json::value& input, TaskDataMap& output, std::set<std::string>& existing_keys,
+                                  const TaskDataMap& default_value)
 {
     if (!input.is_object()) {
         LogError << "json is not object";
@@ -136,6 +156,11 @@ bool PipelineResMgr::parse_config(const json::value& input, TaskDataMap& output,
     TaskDataMap data_map;
 
     for (const auto& [key, value] : input.as_object()) {
+        if (existing_keys.contains(key)) {
+            LogError << "key already exists" << VAR(key);
+            return false;
+        }
+
         TaskData task_data;
         const auto& default_task_data = default_value.contains(key) ? default_value.at(key) : TaskData {};
         bool ret = parse_task(key, value, task_data, default_task_data);
@@ -144,6 +169,7 @@ bool PipelineResMgr::parse_config(const json::value& input, TaskDataMap& output,
             return false;
         }
         data_map.insert_or_assign(key, task_data);
+        existing_keys.emplace(key);
     }
 
     output = std::move(data_map);

source/MaaFramework/Resource/PipelineResMgr.h

@@ -3,6 +3,7 @@
 #include "Utils/NonCopyable.hpp"
 
 #include <filesystem>
+#include <set>
 #include <unordered_map>
 
 #include <meojson/json.hpp>
@@ -27,7 +28,8 @@ class PipelineResMgr : public NonCopyable
     const TaskDataMap& get_task_data_map() const { return task_data_map_; }
 
 public:
-    static bool parse_config(const json::value& input, TaskDataMap& output, const TaskDataMap& default_value);
+    static bool parse_config(const json::value& input, TaskDataMap& output, std::set<std::string>& existing_keys,
+                             const TaskDataMap& default_value);
     static bool parse_task(const std::string& name, const json::value& input, TaskData& output,
                            const TaskData& default_value);
 
@@ -73,7 +75,7 @@ class PipelineResMgr : public NonCopyable
 
 private:
     bool load_all_json(const std::filesystem::path& path);
-    bool open_and_parse_file(const std::filesystem::path& path);
+    bool open_and_parse_file(const std::filesystem::path& path, std::set<std::string>& existing_keys);
     bool check_all_next_list() const;
     bool check_next_list(const TaskData::NextList& next_list) const;
 

source/MaaFramework/Task/TaskDataMgr.cpp

@@ -50,7 +50,8 @@ bool TaskDataMgr::set_diff_task(const json::value& input)
 
     MAA_RES_NS::PipelineResMgr::TaskDataMap task_data_map;
     auto& raw_data_map = resource()->pipeline_res().get_task_data_map();
-    bool parsed = MAA_RES_NS::PipelineResMgr::parse_config(input, task_data_map, raw_data_map);
+    std::set<std::string> existing_keys;
+    bool parsed = MAA_RES_NS::PipelineResMgr::parse_config(input, task_data_map, existing_keys, raw_data_map);
     if (!parsed) {
         LogError << "Parse json failed";
         return false;