fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: Task加载检查前重复任务

Browse Source
This commit is contained in:
status102
2025-04-27 23:35:49 +08:00
parent 63e801350f
commit d044e79ebc
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/MaaCore/Config/TaskData.cpp
View File

@@ -222,7 +222,7 @@ bool asst::TaskData::load(const std::filesystem::path& path)
{
LogTraceScope("TaskData::load");
json::value merged = json::object();
json::object merged;
if (is_regular_file(path)) {
Log.debug("TaskData::load", "Loading json file:", path);
@@ -231,7 +231,7 @@ bool asst::TaskData::load(const std::filesystem::path& path)
Log.error("TaskData::load", "Json open failed:", path);
return false;
}
merged = ret.value();
merged = ret->as_object();
}
else if (is_directory(path)) {
std::vector<std::filesystem::path> json_files;
@@ -253,7 +253,10 @@ bool asst::TaskData::load(const std::filesystem::path& path)
continue;
}
for (auto& [key, value] : file_json.as_object()) {
merged.as_object()[key] = std::move(value);
if (!merged.emplace(key, std::move(value)).second) {
Log.error(__FUNCTION__, "Duplicate key in json file:", file, key);
return false;
}
}
}
}