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

Issue #79 fixes.

Browse Source 
Forgot that BSAs only need to start with the plugin basename.
This commit is contained in:
WrinklyNinja
2014-01-26 23:07:29 +00:00
parent 475ed2961f
commit 22b128014a
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/metadata.cpp
+14 -3
View File
@@ -621,8 +621,8 @@ namespace boss {
bool Plugin::operator == (const Plugin& rhs) const {
return (boost::iequals(name, rhs.Name())
|| (IsRegexPlugin() && boost::regex_match(rhs.Name(), boost::regex(name, boost::regex::extended|boost::regex::icase)))
|| (rhs.IsRegexPlugin() && boost::regex_match(name, boost::regex(rhs.Name(), boost::regex::extended|boost::regex::icase))));
|| (IsRegexPlugin() && boost::regex_match(rhs.Name(), boost::regex(name, boost::regex::perl|boost::regex::icase)))
|| (rhs.IsRegexPlugin() && boost::regex_match(name, boost::regex(rhs.Name(), boost::regex::perl|boost::regex::icase))));
}
bool Plugin::operator != (const Plugin& rhs) const {
@@ -721,7 +721,18 @@ namespace boss {
}
bool Plugin::HasBSA(const Game& game) const {
return boost::filesystem::exists(game.DataPath() / (name.substr(0, name.length() - 4) + ".bsa"));
//BSAs must start with the plugin basename and have the extension .bsa.
for (boost::filesystem::directory_iterator it(game.DataPath()); it != boost::filesystem::directory_iterator(); ++it) {
if (boost::filesystem::is_regular_file(it->status()) && boost::iequals(it->path().extension().string(), ".bsa")) {
BOOST_LOG_TRIVIAL(info) << name << " | " << it->path().filename().string();
if (!IsRegexPlugin() && boost::istarts_with(it->path().filename().string(), name.substr(0, name.length() - 4)))
return true;
else if (IsRegexPlugin() && boost::regex_search(it->path().filename().string(), boost::regex(name.substr(0, name.length() - 5), boost::regex::perl | boost::regex::icase), boost::match_continuous)) {
return true;
}
}
}
return false;
}
bool operator == (const File& lhs, const Plugin& rhs) {