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

Fixed issue #65.

Browse Source
This commit is contained in:
WrinklyNinja
2013-09-20 17:15:31 +01:00
parent c8b3641a73
commit ebf85f9414
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/game.cpp
+1 -1
View File
@@ -266,7 +266,7 @@ namespace boss {
}
for (size_t i=0; i < pluginArrSize; ++i) {
activePlugins.insert(string(pluginArr[i]));
activePlugins.insert(boost::to_lower_copy(string(pluginArr[i])));
}
lo_destroy_handle(gh);
src/backend/parsers.h
+16 -3
View File
@@ -450,7 +450,7 @@ namespace boss {
BOOST_LOG_TRIVIAL(trace) << "Checking to see if any files matching the regex \"" << regexStr << "\" exist.";
boost::regex sepReg("/|(\\\\)", boost::regex::perl);
boost::regex sepReg("/|(\\\\\\\\)", boost::regex::perl);
std::vector<std::string> components;
boost::algorithm::split_regex(components, regexStr, sepReg);
@@ -475,8 +475,10 @@ namespace boss {
//the parent path exists and is a directory.
boost::filesystem::path parent_path = game->DataPath() / parent;
if (!boost::filesystem::exists(parent_path) || !boost::filesystem::is_directory(parent_path))
if (!boost::filesystem::exists(parent_path) || !boost::filesystem::is_directory(parent_path)) {
BOOST_LOG_TRIVIAL(trace) << "The path \"" << parent_path << "\" does not exist or is not a directory.";
return;
}
boost::regex regex;
try {
@@ -489,6 +491,7 @@ namespace boss {
for (boost::filesystem::directory_iterator itr(parent_path); itr != boost::filesystem::directory_iterator(); ++itr) {
if (boost::regex_match(itr->path().filename().string(), regex)) {
result = true;
BOOST_LOG_TRIVIAL(trace) << "Matching file found: " << itr->path();
return;
}
}
@@ -534,6 +537,7 @@ namespace boss {
if (!result) {
if (comparator == "!=" || comparator == "<" || comparator == "<=")
result = true;
BOOST_LOG_TRIVIAL(trace) << "Version check result: " << result;
return;
}
@@ -541,9 +545,14 @@ namespace boss {
Version trueVersion;
if (file == "BOSS")
trueVersion = Version(boost::filesystem::absolute("BOSS.exe"));
else
else if (IsPlugin(file)) {
Plugin plugin(*game, file, true);
trueVersion = Version(plugin.Version());
} else
trueVersion = Version(game->DataPath() / file);
BOOST_LOG_TRIVIAL(trace) << "Version extracted: " << trueVersion.AsString();
if ( (comparator == "==" && trueVersion != givenVersion)
|| (comparator == "!=" && trueVersion == givenVersion)
|| (comparator == "<" && trueVersion >= givenVersion)
@@ -551,6 +560,8 @@ namespace boss {
|| (comparator == "<=" && trueVersion > givenVersion)
|| (comparator == ">=" && trueVersion < givenVersion))
result = false;
BOOST_LOG_TRIVIAL(trace) << "Version check result: " << result;
}
void CheckActive(bool& result, const std::string& file) {
@@ -558,6 +569,8 @@ namespace boss {
result = false;
else
result = game->IsActive(file);
BOOST_LOG_TRIVIAL(trace) << "Active check result: " << result;
}
void SyntaxError(Iterator const& /*first*/, Iterator const& last, Iterator const& errorpos, boost::spirit::info const& what) {