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 for ghosted plugin CRCs.

Browse Source 
Also fixed lowercasing. Both fixes just mean one less CRC calculation
per affected plugin though.
This commit is contained in:
Oliver Hamlet
2014-09-24 10:56:58 +01:00
parent fe786ef607
commit 950c88c5ec
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/metadata.cpp
+8 -8
View File
@@ -339,11 +339,17 @@ namespace loot {
Plugin::Plugin(loot::Game& game, const std::string& n, const bool headerOnly)
: name(n), enabled(true), priority(0), isMaster(false), crc(0), numOverrideRecords(0), _isPriorityExplicit(false) {
//If the name passed ends in '.ghost', that should be trimmed.
if (boost::iends_with(name, ".ghost")) {
BOOST_LOG_TRIVIAL(trace) << name << ": " << "Trimming '.ghost' extension.";
name = name.substr(0, name.length() - 6);
}
// Get data from file contents using libespm. Assumes libespm has already been initialised.
BOOST_LOG_TRIVIAL(trace) << name << ": " << "Opening with libespm...";
boost::filesystem::path filepath = game.DataPath() / name;
//In case the plugin is ghosted, but the extension already got trimmed.
//In case the plugin is ghosted.
if (!boost::filesystem::exists(filepath) && boost::filesystem::exists(filepath.string() + ".ghost"))
filepath += ".ghost";
@@ -368,7 +374,7 @@ namespace loot {
BOOST_LOG_TRIVIAL(trace) << name << ": " << "Getting CRC.";
crc = file->crc;
game.crcCache.insert(pair<string, uint32_t>(n, crc));
game.crcCache.insert(pair<string, uint32_t>(boost::locale::to_lower(name), crc));
BOOST_LOG_TRIVIAL(trace) << name << ": " << "Getting the FormIDs.";
vector<uint32_t> records = file->getFormIDs();
@@ -421,12 +427,6 @@ namespace loot {
messages.push_back(loot::Message(loot::Message::error, (boost::format(boost::locale::translate("Cannot read \"%1%\". Details: %2%")) % name % e.what()).str()));
}
//If the name passed ends in '.ghost', that should be trimmed.
if (boost::iends_with(name, ".ghost")) {
BOOST_LOG_TRIVIAL(trace) << name << ": " << "Trimming '.ghost' extension.";
name = name.substr(0, name.length() - 6);
}
BOOST_LOG_TRIVIAL(trace) << name << ": " << "Plugin loading complete.";
}
src/backend/parsers.h
+2 -2
View File
@@ -583,7 +583,7 @@ namespace loot {
}
uint32_t crc;
unordered_map<std::string, uint32_t>::iterator it = _game.crcCache.find(boost::to_lower_copy(file));
unordered_map<std::string, uint32_t>::iterator it = _game.crcCache.find(boost::locale::to_lower(file));
if (it != _game.crcCache.end())
crc = it->second;
@@ -599,7 +599,7 @@ namespace loot {
return;
}
_game.crcCache.emplace(boost::to_lower_copy(file), crc);
_game.crcCache.emplace(boost::locale::to_lower(file), crc);
}
result = checksum == crc;