picnoir/Nix
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

nix ls-{store,nar}: Add --json flag

Browse source
This commit is contained in:
Eelco Dolstra 2017-11-14 14:23:53 +01:00
parent c0d93a01ee
commit bac8055652
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 53 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/libstore/binary-cache-store.cc
View file

@ -119,42 +119,9 @@ void BinaryCacheStore::addToStore(const ValidPathInfo & info, const ref<std::str
accessor_->addToCache(info.path, *nar);
}
std::function<void(const Path &, JSONPlaceholder &)> recurse;
recurse = [&](const Path & path, JSONPlaceholder & res) {
auto st = narAccessor->stat(path);
auto obj = res.object();
switch (st.type) {
case FSAccessor::Type::tRegular:
obj.attr("type", "regular");
obj.attr("size", st.fileSize);
if (st.isExecutable)
obj.attr("executable", true);
break;
case FSAccessor::Type::tDirectory:
obj.attr("type", "directory");
{
auto res2 = obj.object("entries");
for (auto & name : narAccessor->readDirectory(path)) {
auto res3 = res2.placeholder(name);
recurse(path + "/" + name, res3);
}
}
break;
case FSAccessor::Type::tSymlink:
obj.attr("type", "symlink");
obj.attr("target", narAccessor->readLink(path));
break;
default:
abort();
}
};
{
auto res = jsonRoot.placeholder("root");
recurse("", res);
listNar(res, narAccessor, "");
}
}

33
src/libstore/nar-accessor.cc
View file

@ -1,5 +1,6 @@
#include "nar-accessor.hh"
#include "archive.hh"
#include "json.hh"
#include <map>
#include <stack>
@ -181,4 +182,36 @@ ref<FSAccessor> makeNarAccessor(ref<const std::string> nar)
return make_ref<NarAccessor>(nar);
}
void listNar(JSONPlaceholder & res, ref<FSAccessor> accessor, const Path & path)
{
auto st = accessor->stat(path);
auto obj = res.object();
switch (st.type) {
case FSAccessor::Type::tRegular:
obj.attr("type", "regular");
obj.attr("size", st.fileSize);
if (st.isExecutable)
obj.attr("executable", true);
break;
case FSAccessor::Type::tDirectory:
obj.attr("type", "directory");
{
auto res2 = obj.object("entries");
for (auto & name : accessor->readDirectory(path)) {
auto res3 = res2.placeholder(name);
listNar(res3, accessor, path + "/" + name);
}
}
break;
case FSAccessor::Type::tSymlink:
obj.attr("type", "symlink");
obj.attr("target", accessor->readLink(path));
break;
default:
abort();
}
}
}

4
src/libstore/nar-accessor.hh
View file

@ -8,4 +8,8 @@ namespace nix {
file. */
ref<FSAccessor> makeNarAccessor(ref<const std::string> nar);
class JSONPlaceholder;
void listNar(JSONPlaceholder & res, ref<FSAccessor> accessor, const Path & path);
}

21
src/nix/ls.cc
View file

@ -2,10 +2,12 @@
#include "store-api.hh"
#include "fs-accessor.hh"
#include "nar-accessor.hh"
#include "common-args.hh"
#include "json.hh"
using namespace nix;
struct MixLs : virtual Args
struct MixLs : virtual Args, MixJSON
{
std::string path;
@ -20,7 +22,7 @@ struct MixLs : virtual Args
mkFlag('d', "directory", "show directories rather than their contents", &showDirectory);
}
void list(ref<FSAccessor> accessor)
void listText(ref<FSAccessor> accessor)
{
std::function<void(const FSAccessor::Stat &, const Path &, const std::string &, bool)> doPath;
@ -61,10 +63,6 @@ struct MixLs : virtual Args
showFile(curPath, relPath);
};
if (path == "/") {
path = "";
}
auto st = accessor->stat(path);
if (st.type == FSAccessor::Type::tMissing)
throw Error(format("path '%1%' does not exist") % path);
@ -72,6 +70,17 @@ struct MixLs : virtual Args
st.type == FSAccessor::Type::tDirectory ? "." : baseNameOf(path),
showDirectory);
}
void list(ref<FSAccessor> accessor)
{
if (path == "/") path = "";
if (json) {
JSONPlaceholder jsonRoot(std::cout, true);
listNar(jsonRoot, accessor, path);
} else
listText(accessor);
}
};
struct CmdLsStore : StoreCommand, MixLs