new level-based controllers

[chaz/yoink] / src / Moof / Settings.cc

diff --git a/src/Moof/Settings.cc b/src/Moof/Settings.cc
index 624179ce36998c16efed54b1b75414f97c7d28b7..5a321b01be9e53da843e43887d6def5029336a83 100644 (file)
--- a/src/Moof/Settings.cc
+++ b/src/Moof/Settings.cc
@@ -28,9 +28,6 @@
 
 #include <sstream>
 #include <cstdlib>             // getenv
-#include <cstring>             // strchr
-
-#include <boost/algorithm/string.hpp>
 
 #include "Settings.hh"
 
@@ -38,12 +35,6 @@
 namespace Mf {
 
 
-Settings::Settings(int argc, char* argv[])
-{
-       parseArgs(argc, argv);
-}
-
-
 Settings& Settings::getInstance()
 {
        static Settings settings;
@@ -55,44 +46,20 @@ void Settings::parseArgs(int argc, char* argv[])
 {
        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
-                       {
-                               SerializableP 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] = SerializableP(new SerializableBasic<Serializable::String>(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;
 
@@ -104,33 +71,15 @@ void Settings::loadFromFiles(const std::vector<std::string>& filePaths,
 
                if (home)
                {
-                       boost::replace_first(path, "$HOME", home);
+                       boost::replace_all(path, "$HOME", home);
                }
 
-               try
-               {
-                       Deserializer deserializer(*it, true);
-
-                       SerializableP obj = deserializer.deserialize();
-                       Serializable::Map 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();
                }
        }
 }