loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused MetadataList::EvalAllConditions()

Browse Source
This commit is contained in:
Oliver Hamlet
2023-04-20 18:14:17 +01:00
parent c5efd9e5c2
commit d9a587065d
3 changed files with 0 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/metadata_list.cpp
-35
View File
@@ -277,10 +277,6 @@ void MetadataList::Clear() {
plugins_.clear();
regexPlugins_.clear();
messages_.clear();
unevaluatedPlugins_.clear();
unevaluatedRegexPlugins_.clear();
unevaluatedMessages_.clear();
}
std::vector<PluginMetadata> MetadataList::Plugins() const {
@@ -376,35 +372,4 @@ void MetadataList::ErasePlugin(const std::string& pluginName) {
void MetadataList::AppendMessage(const Message& message) {
messages_.push_back(message);
}
void MetadataList::EvalAllConditions(ConditionEvaluator& conditionEvaluator) {
if (unevaluatedPlugins_.empty())
unevaluatedPlugins_.swap(plugins_);
else
plugins_.clear();
for (const auto& plugin : unevaluatedPlugins_) {
plugins_.emplace(plugin.first,
conditionEvaluator.EvaluateAll(plugin.second));
}
if (unevaluatedRegexPlugins_.empty())
unevaluatedRegexPlugins_ = regexPlugins_;
else
regexPlugins_ = unevaluatedRegexPlugins_;
for (auto& plugin : regexPlugins_) {
plugin = conditionEvaluator.EvaluateAll(plugin);
}
if (unevaluatedMessages_.empty())
unevaluatedMessages_.swap(messages_);
else
messages_.clear();
for (const auto& message : unevaluatedMessages_) {
if (conditionEvaluator.Evaluate(message.GetCondition()))
messages_.push_back(message);
}
}
}
src/api/metadata_list.h
-7
View File
@@ -78,9 +78,6 @@ public:
void AppendMessage(const Message& message);
// Eval plugin conditions.
void EvalAllConditions(ConditionEvaluator& conditionEvaluator);
private:
std::vector<Group> groups_;
std::vector<std::string> bashTags_;
@@ -88,10 +85,6 @@ private:
std::vector<PluginMetadata> regexPlugins_;
std::vector<Message> messages_;
std::unordered_map<Filename, PluginMetadata> unevaluatedPlugins_;
std::vector<PluginMetadata> unevaluatedRegexPlugins_;
std::vector<Message> unevaluatedMessages_;
void Load(std::istream& istream, const std::filesystem::path& source_path);
};
}
src/tests/api/internals/metadata_list_test.h
-36
View File
@@ -451,42 +451,6 @@ TEST_P(MetadataListTest,
EXPECT_FALSE(metadataList.FindPlugin(plugin.GetName()));
}
TEST_P(
MetadataListTest,
evalAllConditionsShouldEvaluateTheConditionsForThePluginsStoredInTheMetadataList) {
Game game(GetParam(), dataPath.parent_path(), localPath);
ConditionEvaluator evaluator(game.Type(), game.DataPath());
MetadataList metadataList;
ASSERT_NO_THROW(metadataList.Load(metadataPath));
PluginMetadata plugin = metadataList.FindPlugin(blankEsm).value();
ASSERT_EQ(
std::vector<Message>({
Message(MessageType::warn, "This is a warning."),
Message(MessageType::say,
"This message should be removed when evaluating conditions.",
"active(\"Blank - Different.esm\")"),
}),
plugin.GetMessages());
plugin = metadataList.FindPlugin(blankEsp).value();
ASSERT_EQ(blankEsp, plugin.GetName());
ASSERT_FALSE(plugin.HasNameOnly());
EXPECT_NO_THROW(metadataList.EvalAllConditions(evaluator));
plugin = metadataList.FindPlugin(blankEsm).value();
EXPECT_EQ(std::vector<Message>({
Message(MessageType::warn, "This is a warning."),
}),
plugin.GetMessages());
plugin = metadataList.FindPlugin(blankEsp).value();
EXPECT_EQ(blankEsp, plugin.GetName());
EXPECT_TRUE(plugin.GetDirtyInfo().empty());
}
TEST(ReplaceMetadataListPrelude, shouldReturnAnEmptyStringIfGivenEmptyStrings) {
std::string prelude = "";
std::string masterlist = "";