#include <sstream>
#include <cstdlib> // getenv
-#include <cstring> // strchr
-
-#include <boost/algorithm/string.hpp>
#include "Settings.hh"
namespace Mf {
-Settings::Settings(int argc, char* argv[])
+Settings& Settings::getInstance()
{
- parseArgs(argc, argv);
+ static Settings settings;
+ return settings;
}
{
for (int i = 1; i < argc; ++i)
{
- char* where = strchr(argv[i], (int)'=');
-
- if (where)
- {
- std::string key(argv[i], (size_t)(where - argv[i]));
- std::string stringValue(where + 1);
-
- std::stringstream stream;
- stream << stringValue << std::endl;
-
- Deserializer deserializer(stream);
-
- try
- {
- SerializablePtr value(deserializer.deserialize());
- map_[key] = value;
- }
- catch (std::exception e)
- {
- // it doesn't deserialize to anything we know, so just store it
- // as a string
- map_[key] = SerializablePtr(new SerializableString(stringValue));
- }
- }
+ script_.doString(argv[i]);
}
}
-void Settings::loadFromFile(const std::string& filePath, bool precedence)
+void Settings::loadFromFile(const std::string& filePath)
{
std::vector<std::string> paths;
boost::split(paths, filePath, boost::is_any_of(":"));
- loadFromFiles(paths, precedence);
+ loadFromFiles(paths);
}
-void Settings::loadFromFiles(const std::vector<std::string>& filePaths,
- bool precedence)
+void Settings::loadFromFiles(const std::vector<std::string>& filePaths)
{
std::vector<std::string>::const_iterator it;
if (home)
{
- boost::replace_first(path, "$HOME", home);
+ boost::replace_all(path, "$HOME", home);
}
- try
- {
- Deserializer deserializer(*it, true);
-
- SerializablePtr obj = deserializer.deserialize();
- std::map<std::string,SerializablePtr> map;
-
- if (obj && obj->get(map))
- {
- if (!precedence)
- {
- map_.insert(map.begin(), map.end());
- }
- else
- {
- map.insert(map_.begin(), map_.end());
- map_ = map;
- }
- }
- }
- catch (Deserializer::Exception e)
+ if (script_.doFile(path) != Script::SUCCESS)
{
- std::cerr << "Cannot load settings from " << *it <<
- " because an exception was thrown: " << e.what() << std::endl;
+ std::string str;
+ script_[-1].get(str);
+ logScript("%s", str.c_str());
+ script_.clear();
}
}
}