X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FSettings.cc;h=5e19ed599ee511b0abef7306fa9fade271135fd2;hp=ad9c3b0fdebbb9b9eaf14a4ae5d752cad1acb278;hb=3f6e44698c38b74bb622ad81ea9d2daa636981d2;hpb=a5f0d391406a68275b41448fc3f49e8d8396c497

diff --git a/src/Moof/Settings.cc b/src/Moof/Settings.cc
index ad9c3b0..5e19ed5 100644
--- a/src/Moof/Settings.cc
+++ b/src/Moof/Settings.cc
@@ -26,11 +26,7 @@
 
 *******************************************************************************/
 
-#include <sstream>
 #include <cstdlib>		// getenv
-#include <cstring>		// strchr
-
-#include <boost/algorithm/string.hpp>
 
 #include "Settings.hh"
 
@@ -38,104 +34,93 @@
 namespace Mf {
 
 
-Settings::Settings(int argc, char* argv[])
+Settings::~Settings()
 {
-	parseArgs(argc, argv);
+	save();
 }
 
-
-Settings& Settings::getInstance()
-{
-	static Settings settings;
-	return settings;
-}
+//Settings& Settings::getInstance()
+//{
+	//static Settings settings;
+	//return settings;
+//}
 
 
 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::loadFromFiles(const std::string& path)
 {
 	std::vector<std::string> paths;
-	boost::split(paths, filePath, boost::is_any_of(":"));
+	boost::split(paths, path, 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>& path)
 {
-	std::vector<std::string>::const_iterator it;
-
-	char* home = getenv("HOME");
-
-	for (it = filePaths.begin(); it != filePaths.end(); ++it)
+	std::vector<std::string> copy(path);
+	std::vector<std::string>::iterator it;
+
+#if defined(_WIN32) || defined(__WIN32__)
+	char* homeDrive = getenv("HOMEDRIVE");
+	char* homePath = getenv("HOMEPATH");
+	std::string home(homeDrive ? homeDrive : "");
+	if (homePath) home += homePath;
+#else
+	char *homePath = getenv("HOME");
+	std::string home(homePath ? homePath : "");
+#endif
+
+	for (it = copy.begin(); it != copy.end(); ++it)
 	{
-		std::string path = *it;
-
-		if (home)
+		if (!home.empty())
 		{
-			boost::replace_first(path, "$HOME", home);
-		}
+			boost::replace_all(*it, "$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;
-				}
-			}
+			//Mf::logDebug("Copying global settings...");
+			//mUserFile = *it;
+			//mGlobals.pushCopy();
+			//mScript.set("globals", Script::REGISTRY);
 		}
-		catch (Deserializer::Exception e)
+
+		if (mScript.doFile(*it) != 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);
+			logWarning(str);
+			mScript.clear();
 		}
 	}
 }
 
 
+void Settings::clear()
+{
+	mScript.reset();
+}
+
+
+void Settings::saveAs(const std::string& path)
+{
+	mUserFile = path;
+	save();
+}
+
+void Settings::save() const
+{
+}
+
+
+Settings settings;
+
+
 } // namepsace Mf
 
 /** vim: set ts=4 sw=4 tw=80: *************************************************/