wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-30 15:48:00 +02:00
Code Activity

Improve nix show-config --json

Browse source 
In particular, show descriptions. This could be used for manpage
generation etc.
This commit is contained in:
Eelco Dolstra 2017-04-20 17:34:47 +02:00
parent 4410e9d995
commit efa4bdbfcd
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
6 changed files with 71 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/libutil/config.cc
View file

@ -1,5 +1,6 @@
#include "config.hh"
#include "args.hh"
#include "json.hh"
namespace nix {
@ -103,6 +104,17 @@ void Config::resetOverriden()
s.second.setting->overriden = false;
}
void Config::toJSON(JSONObject & out)
{
for (auto & s : _settings)
if (!s.second.isAlias) {
JSONObject out2(out.object(s.first));
out2.attr("description", s.second.setting->description);
JSONPlaceholder out3(out2.placeholder("value"));
s.second.setting->toJSON(out3);
}
}
AbstractSetting::AbstractSetting(
const std::string & name,
const std::string & description,
@ -111,6 +123,17 @@ AbstractSetting::AbstractSetting(
{
}
void AbstractSetting::toJSON(JSONPlaceholder & out)
{
out.write(to_string());
}
template<typename T>
void BaseSetting<T>::toJSON(JSONPlaceholder & out)
{
out.write(value);
}
template<> void BaseSetting<std::string>::set(const std::string & str)
{
value = str;
@ -161,6 +184,13 @@ template<> std::string BaseSetting<Strings>::to_string()
return concatStringsSep(" ", value);
}
template<> void BaseSetting<Strings>::toJSON(JSONPlaceholder & out)
{
JSONList list(out.list());
for (auto & s : value)
list.elem(s);
}
template<> void BaseSetting<StringSet>::set(const std::string & str)
{
value = tokenizeString<StringSet>(str);
@ -171,12 +201,20 @@ template<> std::string BaseSetting<StringSet>::to_string()
return concatStringsSep(" ", value);
}
template<> void BaseSetting<StringSet>::toJSON(JSONPlaceholder & out)
{
JSONList list(out.list());
for (auto & s : value)
list.elem(s);
}
template class BaseSetting<int>;
template class BaseSetting<unsigned int>;
template class BaseSetting<long>;
template class BaseSetting<unsigned long>;
template class BaseSetting<long long>;
template class BaseSetting<unsigned long long>;
template class BaseSetting<bool>;
void PathSetting::set(const std::string & str)
{