X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FSettings.hh;h=d4cbb9fa0cd47e0a06a0f21a4ea5a3923f6a5d7d;hp=9c29007613f90d6b35a7c8500208581dae05a5a5;hb=987971a961454d97082c6448fdc0bbeb540281bb;hpb=c2321281bf12a7efaedde930422c7ddbc92080d4

diff --git a/src/Moof/Settings.hh b/src/Moof/Settings.hh
index 9c29007..d4cbb9f 100644
--- a/src/Moof/Settings.hh
+++ b/src/Moof/Settings.hh
@@ -34,71 +34,85 @@
  * Load, store, save program settings.
  */
 
-#include <map>
 #include <string>
+#include <vector>
 
-#include <Moof/Singleton.hh>
-#include <Moof/Serializable.hh>
+#include <boost/algorithm/string.hpp>
+
+#include <Moof/Log.hh>
+#include <Moof/Script.hh>
 
 
 namespace Mf {
 
 
-class Settings : public Singleton<Settings>
+class Settings
 {
 public:
-	Settings() {}
-	Settings(int argc, char* argv[]);
+
+	Settings()
+	{
+		mScript.importBaseLibrary();
+		importLogFunctions(mScript);
+	}
+
+	~Settings();
 
 	void parseArgs(int argc, char* argv[]);
 
-	void loadFromFile(const std::string& filePath, bool precedence = false);
-	void loadFromFiles(const std::vector<std::string>& filePaths,
-			bool precedence = false);
+	void loadFromFiles(const std::string& path);
+	void loadFromFiles(const std::vector<std::string>& path);
+
+	void clear();		// remove all settings
+
+	void saveAs(const std::string& path);
+	void save() const;
 
 	template <typename T>
-	bool get(const std::string& key, T& value);
-	template <typename T>
-	bool getNumber(const std::string& key, T& value);
+	bool get(const std::string& key, T& value) const;
 
 private:
-	std::map<std::string,SerializablePtr> map_;
+
+	mutable Script	mScript;
+
+	std::string		mUserFile;
 };
 
 
 template <typename T>
-bool Settings::get(const std::string& key, T& value)
+bool Settings::get(const std::string& key, T& value) const
 {
-	std::map<std::string,SerializablePtr>::const_iterator it = map_.find(key);
+	Script::Slot top = mScript[-1];
+	Script::Slot globals = mScript.getGlobalTable();
 
-	if (it != map_.end())
-	{
-		SerializablePtr obj = (*it).second;
-		return obj->get(value);
-	}
-	else
-	{
-		return false;
-	}
-}
+	std::vector<std::string> fields;
+	boost::split(fields, key, boost::is_any_of("."));
 
-template <typename T>
-bool Settings::getNumber(const std::string& key, T& value)
-{
-	std::map<std::string,SerializablePtr>::const_iterator it = map_.find(key);
+	globals.pushCopy();
 
-	if (it != map_.end())
+	std::vector<std::string>::iterator it;
+	for (it = fields.begin(); it != fields.end(); ++it)
 	{
-		SerializablePtr obj = (*it).second;
-		return obj->getNumber(value);
-	}
-	else
-	{
-		return false;
+		if (top.isTable())
+		{
+			top.pushField(*it);
+		}
+		else
+		{
+			mScript.clear();
+			return false;
+		}
 	}
+
+	bool got = top.get(value);
+	mScript.clear();
+	return got;
 }
 
 
+extern Settings settings;
+
+
 } // namepsace Mf
 
 #endif // _MOOF_SETTINGS_HH_