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

diff --git a/source/config.cpp b/source/config.cpp
index 36a5963..194bf0d 100644
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -1,127 +1,83 @@
-#include <fstream>
-#include <msp/error.h>
-#include <msp/path/utils.h>
+#include <msp/core/maputils.h>
+#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
+#include <msp/io/file.h>
+#include <msp/io/print.h>
 #include <msp/time/utils.h>
+#include "builder.h"
 #include "config.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
 
-/**
-Adds a configuration option.
+Config::Config(SourcePackage &p):
+	package(p),
+	changed(false)
+{ }
 
-@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);
-	if(i==options.end())
-		throw Exception("Tried to access nonexistent option "+name);
-
-	return i->second;
+	return get_item(options, name);
 }
 
-/**
-Checks whether an option with the given name exists.
-*/
 bool Config::is_option(const string &name) const
 {
 	return options.count(name);
 }
 
-/**
-Selects the last profile used.  If the profile cache file is not present, the
-default profile is assumed.
-*/
-void Config::select_last_profile()
+bool Config::update(const StringMap &opts)
 {
-	ifstream in((source/".profile.cache").str().c_str());
-	if(in)
+	bool changed_now = false;
+	for(StringMap::const_iterator i=opts.begin(); i!=opts.end(); ++i)
 	{
-		string profile;
-		in>>profile;
-		set_option("profile", profile);
+		if(set_option(i->first, i->second) && i->first!="profile")
+			changed_now = true;
 	}
-	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)
+	if(changed_now)
 	{
-		if(set_option(i->first, i->second) && i->first!="profile")
-			changed=true;
+		mtime = Time::now();
+		changed = true;
 	}
 
-	if(changed)
-		mtime=Time::now();
+	return changed_now;
+}
 
-	return changed;
+void Config::finish()
+{
+	for(OptionMap::iterator i=options.begin(); i!=options.end(); ++i)
+		i->second.value = package.expand_string(i->second.value);
 }
 
 void Config::save() const
 {
-	Path::Path fn=source/".options.cache";
+	if(!changed)
+		return;
 
-	OptionMap::const_iterator i=options.find("profile");
-	if(i!=options.end())
-		fn=source/(".options."+i->second.value+".cache");
+	FS::Path fn = package.get_source()/".config";
+
+	IO::BufferedFile out(fn.str(), IO::M_WRITE);
 
-	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";
+	for(OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
+		IO::print(out, "option \"%s\" \"%s\";\n", i->second.name, i->second.value);
 }
 
 bool Config::set_option(const string &opt, const string &val)
 {
-	bool result=false;
+	bool result = false;
 
-	OptionMap::iterator i=options.find(opt);
+	OptionMap::iterator i = options.find(opt);
 	if(i!=options.end())
 	{
 		if(i->second.value!=val)
-			result=true;
-		i->second.value=val;
+			result = true;
+		i->second.value = val;
 	}
 
 	return result;
@@ -129,24 +85,22 @@ bool Config::set_option(const string &opt, const string &val)
 
 void Config::load()
 {
-	Path::Path fn=source/".options.cache";
+	FS::Path fn = package.get_source()/".config";
 
-	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;
+	FS::Stat stat = FS::stat(fn);
+	if(stat)
+	{
+		IO::BufferedFile in(fn.str());
 
-	struct stat st;
-	Path::stat(fn, st);
-	mtime=Time::TimeStamp::from_unixtime(st.st_mtime);
+		mtime = stat.get_modify_time();
 
-	Parser::Parser parser(in, fn.str());
-	Loader loader(*this);
-	loader.load(parser);
+		DataFile::Parser parser(in, fn.str());
+		Loader loader(*this);
+		loader.load(parser);
+	}
 }
 
+
 Config::Option::Option(const string &n, const string &v, const string &d):
 	name(n),
 	defv(v),
@@ -154,13 +108,14 @@ Config::Option::Option(const string &n, const string &v, const string &d):
 	value(v)
 { }
 
+
 Config::Loader::Loader(Config &c):
-	conf(c)
+	DataFile::ObjectLoader<Config>(c)
 {
 	add("option", &Loader::option);
 }
 
 void Config::Loader::option(const string &n, const string &v)
 {
-	conf.set_option(n, v);
+	obj.set_option(n, v);
 }