X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMoof%2FSettings.cc;h=5a4f99127f099ef847f1822f8b875614f0d3674b;hb=cfe38a72ab859538db6269bc9b97f55e8f1f8709;hp=fe98f964d079b40e4c580141ef436fb784af0eff;hpb=493ddb59a8620b49dfa0ff62ce93395ebfd02e86;p=chaz%2Fyoink

diff --git a/src/Moof/Settings.cc b/src/Moof/Settings.cc
index fe98f96..5a4f991 100644
--- 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,9 +35,10 @@
 namespace Mf {
 
 
-Settings::Settings(int argc, char* argv[])
+Settings& Settings::getInstance()
 {
-	parseArgs(argc, argv);
+	static Settings settings;
+	return settings;
 }
 
 
@@ -48,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
-			{
-				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));
-			}
-		}
+		mScript.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;
 
@@ -97,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);
-
-			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 (mScript.doFile(path) != Script::SUCCESS)
 		{
-			std::cerr << "Cannot load settings from " << *it <<
-				" because an exception was thrown: " << e.what() << std::endl;
+			std::string str;
+			mScript[-1].get(str);
+			logScript("%s", str.c_str());
+			mScript.clear();
 		}
 	}
 }