mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix ls-{nar,store} --json: Respect -R

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

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

@ -121,7 +121,7 @@ void BinaryCacheStore::addToStore(const ValidPathInfo & info, const ref<std::str
{ {
auto res = jsonRoot.placeholder("root"); auto res = jsonRoot.placeholder("root");
listNar(res, narAccessor, ""); listNar(res, narAccessor, "", true);
} }
} }

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

@ -182,7 +182,8 @@ ref<FSAccessor> makeNarAccessor(ref<const std::string> nar)
return make_ref<NarAccessor>(nar); return make_ref<NarAccessor>(nar);
} }
void listNar(JSONPlaceholder & res, ref<FSAccessor> accessor, const Path & path) void listNar(JSONPlaceholder & res, ref<FSAccessor> accessor,
const Path & path, bool recurse)
{ {
auto st = accessor->stat(path); auto st = accessor->stat(path);
@ -200,8 +201,11 @@ void listNar(JSONPlaceholder & res, ref<FSAccessor> accessor, const Path & path)
{ {
auto res2 = obj.object("entries"); auto res2 = obj.object("entries");
for (auto & name : accessor->readDirectory(path)) { for (auto & name : accessor->readDirectory(path)) {
if (recurse) {
auto res3 = res2.placeholder(name); auto res3 = res2.placeholder(name);
listNar(res3, accessor, path + "/" + name); listNar(res3, accessor, path + "/" + name, true);
} else
res2.object(name);
} }
} }
break; break;

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

@ -10,6 +10,9 @@ ref<FSAccessor> makeNarAccessor(ref<const std::string> nar);
class JSONPlaceholder; class JSONPlaceholder;
void listNar(JSONPlaceholder & res, ref<FSAccessor> accessor, const Path & path); /* Write a JSON representation of the contents of a NAR (except file
contents). */
void listNar(JSONPlaceholder & res, ref<FSAccessor> accessor,
const Path & path, bool recurse);
} }

2
src/nix/ls.cc
View file

@ -77,7 +77,7 @@ struct MixLs : virtual Args, MixJSON
if (json) { if (json) {
JSONPlaceholder jsonRoot(std::cout); JSONPlaceholder jsonRoot(std::cout);
listNar(jsonRoot, accessor, path); listNar(jsonRoot, accessor, path, recursive);
} else } else
listText(accessor); listText(accessor);
} }