mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-06 17:45:33 +00:00
Code Issues Releases Wiki Activity

Make composing variables compose in the expected order

Browse source
This commit is contained in:
AnyOldName3 2020-10-23 01:41:28 +01:00
parent 651a5a27f6
commit cf81f1bbb7
3 changed files with 68 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/main.cpp
View file

@ -164,7 +164,9 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
return false;
}
bpo::variables_map composingVariables = cfgMgr.separateComposingVariables(variables, desc);
cfgMgr.readConfiguration(variables, desc);
cfgMgr.mergeComposingVariables(variables, composingVariables, desc);
Version::Version v = Version::getOpenmwVersion(variables["resources"].as<Files::EscapeHashString>().toStdString());
std::cout << v.describe() << std::endl;

63
components/files/configurationmanager.cpp
View file

@ -2,6 +2,7 @@
#include <components/debug/debuglog.hpp>
#include <components/files/escape.hpp>
#include <components/fallback/validate.hpp>
#include <boost/filesystem/fstream.hpp>
/**
@ -58,23 +59,83 @@ void ConfigurationManager::readConfiguration(boost::program_options::variables_m
{
bool silent = mSilent;
mSilent = quiet;
// User config has the highest priority.
auto composingVariables = separateComposingVariables(variables, description);
Log(Debug::Info) << composingVariables.size() << " composing variables were loaded before the user config";
loadConfig(mFixedPath.getUserConfigPath(), variables, description);
mergeComposingVariables(variables, composingVariables, description);
boost::program_options::notify(variables);
// read either local or global config depending on type of installation
composingVariables = separateComposingVariables(variables, description);
Log(Debug::Info) << composingVariables.size() << " composing variables were loaded before the local config";
bool loaded = loadConfig(mFixedPath.getLocalPath(), variables, description);
mergeComposingVariables(variables, composingVariables, description);
boost::program_options::notify(variables);
if (!loaded)
{
composingVariables = separateComposingVariables(variables, description);
Log(Debug::Info) << composingVariables.size() << " composing variables were loaded before the global config";
loadConfig(mFixedPath.getGlobalConfigPath(), variables, description);
mergeComposingVariables(variables, composingVariables, description);
boost::program_options::notify(variables);
}
mSilent = silent;
}
boost::program_options::variables_map ConfigurationManager::separateComposingVariables(boost::program_options::variables_map & variables, boost::program_options::options_description& description)
{
boost::program_options::variables_map composingVariables;
for (auto itr = variables.begin(); itr != variables.end();)
{
if (description.find((*itr).first, false).semantic()->is_composing())
{
composingVariables.emplace(*itr);
itr = variables.erase(itr);
}
else
++itr;
}
return composingVariables;
}
void ConfigurationManager::mergeComposingVariables(boost::program_options::variables_map & first, boost::program_options::variables_map & second, boost::program_options::options_description& description)
{
for (auto& [name, variableValue] : first)
{
if (description.find(name, false).semantic()->is_composing())
{
if (second[name].defaulted() || second[name].empty())
continue;
boost::any& firstValue = variableValue.value();
const boost::any& secondValue = second[name].value();
if (firstValue.type() == typeid(Files::EscapePathContainer))
{
auto& firstPathContainer = boost::any_cast<Files::EscapePathContainer&>(firstValue);
const auto& secondPathContainer = boost::any_cast<const Files::EscapePathContainer&>(secondValue);
firstPathContainer.insert(firstPathContainer.end(), secondPathContainer.begin(), secondPathContainer.end());
}
else if (firstValue.type() == typeid(Fallback::FallbackMap))
{
auto& firstMap = boost::any_cast<Fallback::FallbackMap&>(firstValue);
const auto& secondMap = boost::any_cast<const Fallback::FallbackMap&>(secondValue);
std::map<std::string, std::string> tempMap(secondMap.mMap);
tempMap.merge(firstMap.mMap);
firstMap.mMap.swap(tempMap);
}
else
Log(Debug::Error) << "Unexpected composing variable type. Curse boost and their blasted arcane templates.";
}
}
}
void ConfigurationManager::processPaths(Files::PathContainer& dataDirs, bool create)
{
std::string path;

4
components/files/configurationmanager.hpp
View file

@ -25,6 +25,10 @@ struct ConfigurationManager
void readConfiguration(boost::program_options::variables_map& variables,
boost::program_options::options_description& description, bool quiet=false);
boost::program_options::variables_map separateComposingVariables(boost::program_options::variables_map& variables, boost::program_options::options_description& description);
void mergeComposingVariables(boost::program_options::variables_map& first, boost::program_options::variables_map& second, boost::program_options::options_description& description);
void processPaths(Files::PathContainer& dataDirs, bool create = false);
///< \param create Try creating the directory, if it does not exist.