X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMoof%2FSettings.cc;h=c5c3734189fc159f63bfd10fb2a702e5fb5a86d5;hb=7f3984f3f9524f5b6813e01ceb2fe576dadff94e;hp=5a321b01be9e53da843e43887d6def5029336a83;hpb=892da43bf5796e7c5f593a6d0f53bd797a36bd3e;p=chaz%2Fyoink

diff --git a/src/Moof/Settings.cc b/src/Moof/Settings.cc
index 5a321b0..c5c3734 100644
--- a/src/Moof/Settings.cc
+++ b/src/Moof/Settings.cc
@@ -35,6 +35,11 @@
 namespace Mf {
 
 
+Settings::~Settings()
+{
+	save();
+}
+
 Settings& Settings::getInstance()
 {
 	static Settings settings;
@@ -46,7 +51,7 @@ void Settings::parseArgs(int argc, char* argv[])
 {
 	for (int i = 1; i < argc; ++i)
 	{
-		script_.doString(argv[i]);
+		mScript.doString(argv[i]);
 	}
 }
 
@@ -72,19 +77,41 @@ void Settings::loadFromFiles(const std::vector<std::string>& filePaths)
 		if (home)
 		{
 			boost::replace_all(path, "$HOME", home);
+
+			//Mf::logDebug("Copying global settings...");
+			//mUserFile = path;
+			//mGlobals.pushCopy();
+			//mScript.set("globals", Script::REGISTRY);
 		}
 
-		if (script_.doFile(path) != Script::SUCCESS)
+		if (mScript.doFile(path) != Script::SUCCESS)
 		{
 			std::string str;
-			script_[-1].get(str);
-			logScript("%s", str.c_str());
-			script_.clear();
+			mScript[-1].get(str);
+			logInfo(str);
+			mScript.clear();
 		}
 	}
 }
 
 
+void Settings::clear()
+{
+	mScript.reset();
+}
+
+
+void Settings::saveAs(const std::string& filePath)
+{
+	mUserFile = filePath;
+	save();
+}
+
+void Settings::save() const
+{
+}
+
+
 } // namepsace Mf
 
 /** vim: set ts=4 sw=4 tw=80: *************************************************/