X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=36a59638f104506a9bf6adaca70ab0d8b2ddd57f;hb=57bdb055acb0453c75b22cb64f35cc0e817a2827;hp=de6b9bce34525c0f86e4dd4f2b3a306840807649;hpb=97001ddfa2463e6a3526eff772962acdad45f995;p=builder.git

diff --git a/source/config.cpp b/source/config.cpp
index de6b9bc..36a5963 100644
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -7,11 +7,22 @@
 using namespace std;
 using namespace Msp;
 
+/**
+Adds a configuration option.
+
+@param   n  Option name
+@param   v  Default value
+@param   d  Description
+*/
 void Config::add_option(const string &n, const string &v, const string &d)
 {
 	options.insert(OptionMap::value_type(n, Option(n, v, d)));
 }
 
+/**
+Gets the given option from the configuration.  If the option doesn't exist,
+an Exception is thrown.
+*/
 const Config::Option &Config::get_option(const string &name) const
 {
 	OptionMap::const_iterator i=options.find(name);
@@ -21,23 +32,63 @@ const Config::Option &Config::get_option(const string &name) const
 	return i->second;
 }
 
+/**
+Checks whether an option with the given name exists.
+*/
 bool Config::is_option(const string &name) const
 {
 	return options.count(name);
 }
 
-bool Config::process(const RawOptionMap &opts)
+/**
+Selects the last profile used.  If the profile cache file is not present, the
+default profile is assumed.
+*/
+void Config::select_last_profile()
+{
+	ifstream in((source/".profile.cache").str().c_str());
+	if(in)
+	{
+		string profile;
+		in>>profile;
+		set_option("profile", profile);
+	}
+	else
+		set_option("profile", "default");
+
+	load();
+}
+
+/**
+Selects the given profile.  The profile cache file is updated as well.
+*/
+void Config::select_profile(const string &profile)
+{
+	set_option("profile", profile);
+
+	ofstream out((source/".profile.cache").str().c_str());
+	if(out)
+		out<<profile<<'\n';
+
+	load();
+}
+
+/**
+Processes options from the given raw option map.  Nonexistent options are
+ignored.  If any options were changed, the mtime of the configuration is updated
+to the current time.
+
+@param   opts  A map to process options from
+
+@return  Whether any option values were changed
+*/
+bool Config::update(const RawOptionMap &opts)
 {
 	bool changed=false;
 	for(RawOptionMap::const_iterator i=opts.begin(); i!=opts.end(); ++i)
 	{
-		OptionMap::iterator j=options.find(i->first);
-		if(j!=options.end())
-		{
-			if(i->second!=j->second.value)
-				changed=true;
-			j->second.value=i->second;
-		}
+		if(set_option(i->first, i->second) && i->first!="profile")
+			changed=true;
 	}
 
 	if(changed)
@@ -46,14 +97,54 @@ bool Config::process(const RawOptionMap &opts)
 	return changed;
 }
 
-void Config::load(const Path::Path &fn)
+void Config::save() const
 {
+	Path::Path fn=source/".options.cache";
+
+	OptionMap::const_iterator i=options.find("profile");
+	if(i!=options.end())
+		fn=source/(".options."+i->second.value+".cache");
+
+	ofstream out(fn.str().c_str());
+	if(!out) return;
+	
+	for(i=options.begin(); i!=options.end(); ++i)
+		out<<"option \""<<i->second.name<<"\" \""<<i->second.value<<"\";\n";
+}
+
+bool Config::set_option(const string &opt, const string &val)
+{
+	bool result=false;
+
+	OptionMap::iterator i=options.find(opt);
+	if(i!=options.end())
+	{
+		if(i->second.value!=val)
+			result=true;
+		i->second.value=val;
+	}
+
+	return result;
+}
+
+void Config::load()
+{
+	Path::Path fn=source/".options.cache";
+
+	OptionMap::iterator i=options.find("profile");
+	if(i!=options.end())
+		fn=source/(".options."+i->second.value+".cache");
+
 	ifstream in(fn.str().c_str());
 	if(!in) return;
 
 	struct stat st;
 	Path::stat(fn, st);
 	mtime=Time::TimeStamp::from_unixtime(st.st_mtime);
+
+	Parser::Parser parser(in, fn.str());
+	Loader loader(*this);
+	loader.load(parser);
 }
 
 Config::Option::Option(const string &n, const string &v, const string &d):
@@ -62,3 +153,14 @@ Config::Option::Option(const string &n, const string &v, const string &d):
 	descr(d),
 	value(v)
 { }
+
+Config::Loader::Loader(Config &c):
+	conf(c)
+{
+	add("option", &Loader::option);
+}
+
+void Config::Loader::option(const string &n, const string &v)
+{
+	conf.set_option(n, v);
+}