-#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)));
+ Option opt(n, v, d);
+ if(pending_options.count(n))
+ opt.value = pending_options[n];
+ options.insert(OptionMap::value_type(n, opt));
}
-/**
-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()
-{
- 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)
- {
- if(set_option(i->first, i->second) && i->first!="profile")
- changed=true;
- }
-
- if(changed)
- mtime=Time::now();
-
- return changed;
-}
-
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";
- 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";
+ package.get_builder().get_logger().log("files", format("Writing %s", fn));
+ IO::BufferedFile out(fn.str(), IO::M_WRITE);
+
+ 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;
+ changed = 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");
+ FS::Path fn = package.get_source()/".config";
- ifstream in(fn.str().c_str());
- if(!in) return;
+ FS::Stat stat = FS::stat(fn);
+ if(stat)
+ {
+ package.get_builder().get_logger().log("files", format("Reading %s", fn));
+ 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),
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);
+ if(obj.options.count(n))
+ obj.set_option(n, v);
+ else
+ obj.pending_options[n] = v;
}