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

Fix Plugin::LoadsArchive() for Skyrim SE and VR

Browse Source 
Skyrim SE matches exact plugin filenames, and also archives that have a " - Textures" suffix. I assume Skyrim VR has the same behaviour.
This commit is contained in:
Oliver Hamlet
2020-07-11 18:33:18 +01:00
parent 402564c396
commit 8188806286
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/plugin.cpp
+25 -3
View File
@@ -315,6 +315,14 @@ std::filesystem::path replaceExtension(std::filesystem::path path,
return path.replace_extension(std::filesystem::u8path(newExtension));
}
std::filesystem::path getTexturesArchivePath(std::filesystem::path pluginPath,
const std::string& newExtension) {
// replace_extension() with no argument just removes the existing extension.
pluginPath.replace_extension();
pluginPath += " - Textures" + newExtension;
return pluginPath;
}
bool equivalent(const std::filesystem::path& path1,
const std::filesystem::path& path2) {
// If the paths are identical, they've got to be equivalent,
@@ -351,13 +359,27 @@ bool Plugin::LoadsArchive(const GameType gameType,
const string archiveExtension = GetArchiveFileExtension(gameType);
if (gameType == GameType::tes5) {
// Skyrim plugins only load BSAs that exactly match their basename.
return std::filesystem::exists(
replaceExtension(pluginPath, archiveExtension));
// Skyrim (non-SE) plugins can only load BSAs that have exactly the same
// basename, ignoring file extensions.
auto archiveFilename = replaceExtension(pluginPath, archiveExtension);
return std::filesystem::exists(archiveFilename);
} else if (gameType == GameType::tes5se || gameType == GameType::tes5vr) {
// Skyrim SE can load BSAs that have exactly the same
// basename, ignoring file extensions, and also BSAs with filenames of
// the form "<basename> - Textures.bsa" (case-insensitively).
// I'm assuming Skyrim VR works the same way as Skyrim SE.
auto archiveFilename = replaceExtension(pluginPath, archiveExtension);
auto texturesArchiveFilename =
getTexturesArchivePath(pluginPath, archiveExtension);
return std::filesystem::exists(archiveFilename) ||
std::filesystem::exists(texturesArchiveFilename);
} else if (gameType != GameType::tes4 ||
boost::iends_with(pluginPath.filename().u8string(), ".esp")) {
// Oblivion .esp files and FO3, FNV, FO4 plugins can load archives which
// begin with the plugin basename.
// I'm assuming that FO4 VR works the same way as FO4.
auto basenameLength = pluginPath.stem().native().length();
auto pluginExtension = pluginPath.extension().native();
src/tests/api/internals/plugin_test.h
+5 -3
View File
@@ -341,7 +341,7 @@ TEST_P(
.LoadsArchive();
if (GetParam() == GameType::tes3 || GetParam() == GameType::tes4 ||
GetParam() == GameType::tes5)
GetParam() == GameType::tes5 || GetParam() == GameType::tes5se)
EXPECT_FALSE(loadsArchive);
else
EXPECT_TRUE(loadsArchive);
@@ -356,7 +356,8 @@ TEST_P(
true)
.LoadsArchive();
if (GetParam() == GameType::tes3 || GetParam() == GameType::tes5)
if (GetParam() == GameType::tes3 || GetParam() == GameType::tes5 ||
GetParam() == GameType::tes5se)
EXPECT_FALSE(loadsArchive);
else
EXPECT_TRUE(loadsArchive);
@@ -373,7 +374,8 @@ TEST_P(
true)
.LoadsArchive();
if (GetParam() == GameType::tes3 || GetParam() == GameType::tes5)
if (GetParam() == GameType::tes3 || GetParam() == GameType::tes5 ||
GetParam() == GameType::tes5se)
EXPECT_FALSE(loadsArchive);
else
EXPECT_TRUE(loadsArchive);