forked from lix-project/lix
nix search: Add --json flag
This commit is contained in:
parent
90825dea51
commit
b144c4d617
|
@ -4,6 +4,8 @@
|
|||
#include "eval-inline.hh"
|
||||
#include "names.hh"
|
||||
#include "get-drvs.hh"
|
||||
#include "common-args.hh"
|
||||
#include "json.hh"
|
||||
|
||||
#include <regex>
|
||||
|
||||
|
@ -19,7 +21,7 @@ std::string hilite(const std::string & s, const std::smatch & m)
|
|||
+ std::string(m.suffix());
|
||||
}
|
||||
|
||||
struct CmdSearch : SourceExprCommand
|
||||
struct CmdSearch : SourceExprCommand, MixJSON
|
||||
{
|
||||
std::string re;
|
||||
|
||||
|
@ -50,6 +52,8 @@ struct CmdSearch : SourceExprCommand
|
|||
|
||||
bool first = true;
|
||||
|
||||
auto jsonOut = json ? std::make_unique<JSONObject>(std::cout, true) : nullptr;
|
||||
|
||||
doExpr = [&](Value * v, std::string attrPath, bool toplevel) {
|
||||
debug("at attribute ‘%s’", attrPath);
|
||||
|
||||
|
@ -86,6 +90,15 @@ struct CmdSearch : SourceExprCommand
|
|||
|| !nameMatch.empty()
|
||||
|| !descriptionMatch.empty())
|
||||
{
|
||||
if (json) {
|
||||
|
||||
auto jsonElem = jsonOut->object(attrPath);
|
||||
|
||||
jsonElem.attr("pkgName", parsed.name);
|
||||
jsonElem.attr("version", parsed.version);
|
||||
jsonElem.attr("description", description);
|
||||
|
||||
} else {
|
||||
if (!first) std::cout << "\n";
|
||||
first = false;
|
||||
|
||||
|
@ -100,6 +113,7 @@ struct CmdSearch : SourceExprCommand
|
|||
hilite(description, descriptionMatch));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
else if (v->type == tAttrs) {
|
||||
|
||||
|
|
Loading…
Reference in a new issue