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

Sort light-master-flagged .esp files as non-masters

Browse Source
This commit is contained in:
Oliver Hamlet
2017-12-21 20:09:10 +00:00
parent 223b4a9a95
commit 6432d323eb
2 changed files with 64 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/plugin/plugin_sorter.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ PluginSortingData::PluginSortingData(const Plugin& plugin,
std::string PluginSortingData::GetName() const { return plugin_.GetName(); }
bool PluginSortingData::IsMaster() const {
return plugin_.IsMaster() || plugin_.IsLightMaster();
return plugin_.IsMaster() || (plugin_.IsLightMaster() && !boost::iends_with(plugin_.GetName(), ".esp"));
}
bool PluginSortingData::LoadsArchive() const { return plugin_.LoadsArchive(); }
src/tests/api/internals/plugin/plugin_sorter_test.h
+63 -3
View File
@@ -34,10 +34,20 @@ namespace loot {
namespace test {
class PluginSorterTest : public CommonGameTestFixture {
protected:
PluginSorterTest() : game_(GetParam(), dataPath.parent_path(), localPath) {}
PluginSorterTest() :
game_(GetParam(), dataPath.parent_path(), localPath),
blankEslEsp("Blank.esl.esp") {}
void TearDown() {
CommonGameTestFixture::TearDown();
if (GetParam() == GameType::fo4 || GetParam() == GameType::tes5se) {
boost::filesystem::remove(dataPath / blankEslEsp);
}
}
void loadInstalledPlugins(Game& game_, bool headersOnly) {
const std::vector<std::string> plugins({
std::vector<std::string> plugins({
masterFile,
blankEsm,
blankDifferentEsm,
@@ -50,16 +60,26 @@ protected:
blankPluginDependentEsp,
blankDifferentPluginDependentEsp,
});
if (GetParam() == GameType::fo4 || GetParam() == GameType::tes5se) {
plugins.push_back(blankEsl);
if (boost::filesystem::exists(dataPath / blankEslEsp)) {
plugins.push_back(blankEslEsp);
}
}
game_.IdentifyMainMasterFile(masterFile);
game_.LoadPlugins(plugins, headersOnly);
}
Game game_;
const std::string blankEslEsp;
};
// Pass an empty first argument, as it's a prefix for the test instantation,
// but we only have the one so no prefix is necessary.
INSTANTIATE_TEST_CASE_P(, PluginSorterTest, ::testing::Values(GameType::tes4));
INSTANTIATE_TEST_CASE_P(, PluginSorterTest, ::testing::Values(GameType::tes4, GameType::fo4));
TEST_P(PluginSorterTest, sortingWithNoLoadedPluginsShouldReturnAnEmptyList) {
PluginSorter sorter;
@@ -68,6 +88,30 @@ TEST_P(PluginSorterTest, sortingWithNoLoadedPluginsShouldReturnAnEmptyList) {
EXPECT_TRUE(sorted.empty());
}
TEST_P(PluginSorterTest,
lightMasterFlaggedEspFilesShouldNotBeTreatedAsMasters) {
if (GetParam() == GameType::fo4 || GetParam() == GameType::tes5se) {
ASSERT_NO_THROW(
boost::filesystem::copy(dataPath / blankEsl, dataPath / blankEslEsp));
}
ASSERT_NO_THROW(loadInstalledPlugins(game_, false));
auto esp = PluginSortingData(*dynamic_cast<const Plugin *>(game_.GetPlugin(blankEsp).get()), PluginMetadata());
EXPECT_FALSE(esp.IsMaster());
auto master = PluginSortingData(*dynamic_cast<const Plugin *>(game_.GetPlugin(blankEsm).get()), PluginMetadata());
EXPECT_TRUE(master.IsMaster());
if (GetParam() == GameType::fo4 || GetParam() == GameType::tes5se) {
auto lightMaster = PluginSortingData(*dynamic_cast<const Plugin *>(game_.GetPlugin(blankEsl).get()), PluginMetadata());
EXPECT_TRUE(lightMaster.IsMaster());
auto lightMasterEsp = PluginSortingData(*dynamic_cast<const Plugin *>(game_.GetPlugin(blankEslEsp).get()), PluginMetadata());
EXPECT_FALSE(lightMasterEsp.IsMaster());
}
}
TEST_P(PluginSorterTest,
sortingShouldNotMakeUnnecessaryChangesToAnExistingLoadOrder) {
ASSERT_NO_THROW(loadInstalledPlugins(game_, false));
@@ -106,6 +150,10 @@ TEST_P(PluginSorterTest, sortingShouldEvaluateRelativeGlobalPriorities) {
blankDifferentPluginDependentEsp,
});
if (GetParam() == GameType::fo4 || GetParam() == GameType::tes5se) {
expectedSortedOrder.insert(expectedSortedOrder.begin() + 5, blankEsl);
}
std::vector<std::string> sorted = ps.Sort(game_);
EXPECT_EQ(expectedSortedOrder, sorted);
}
@@ -158,6 +206,10 @@ TEST_P(
blankDifferentPluginDependentEsp,
});
if (GetParam() == GameType::fo4 || GetParam() == GameType::tes5se) {
expectedSortedOrder.insert(expectedSortedOrder.begin() + 5, blankEsl);
}
std::vector<std::string> sorted = ps.Sort(game_);
EXPECT_EQ(expectedSortedOrder, sorted);
}
@@ -186,6 +238,10 @@ TEST_P(PluginSorterTest,
blankPluginDependentEsp,
});
if (GetParam() == GameType::fo4 || GetParam() == GameType::tes5se) {
expectedSortedOrder.insert(expectedSortedOrder.begin() + 5, blankEsl);
}
std::vector<std::string> sorted = ps.Sort(game_);
EXPECT_EQ(expectedSortedOrder, sorted);
}
@@ -214,6 +270,10 @@ TEST_P(PluginSorterTest,
blankPluginDependentEsp,
});
if (GetParam() == GameType::fo4 || GetParam() == GameType::tes5se) {
expectedSortedOrder.insert(expectedSortedOrder.begin() + 5, blankEsl);
}
std::vector<std::string> sorted = ps.Sort(game_);
EXPECT_EQ(expectedSortedOrder, sorted);
}