quickdudley/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge branch 'improve-search-algorithm' of git://github.com/Ma27/nix

Browse source
This commit is contained in:
Shea Levy 2018-03-02 11:41:08 -05:00
parent aa8bbbf69d 0413aeb35d
commit 3748a0ca1e
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nix/search.cc
View file

@ -82,8 +82,6 @@ struct CmdSearch : SourceExprCommand, MixJSON
auto state = getEvalState(); auto state = getEvalState();
bool first = true;
auto jsonOut = json ? std::make_unique<JSONObject>(std::cout) : nullptr; auto jsonOut = json ? std::make_unique<JSONObject>(std::cout) : nullptr;
auto sToplevel = state->symbols.create("_toplevel"); auto sToplevel = state->symbols.create("_toplevel");
@ -91,6 +89,8 @@ struct CmdSearch : SourceExprCommand, MixJSON
bool fromCache = false; bool fromCache = false;
std::map<std::string, std::string> results;
std::function<void(Value *, std::string, bool, JSONObject *)> doExpr; std::function<void(Value *, std::string, bool, JSONObject *)> doExpr;
doExpr = [&](Value * v, std::string attrPath, bool toplevel, JSONObject * cache) { doExpr = [&](Value * v, std::string attrPath, bool toplevel, JSONObject * cache) {
@ -138,10 +138,7 @@ struct CmdSearch : SourceExprCommand, MixJSON
jsonElem.attr("description", description); jsonElem.attr("description", description);
} else { } else {
if (!first) std::cout << "\n"; results[attrPath] = fmt(
first = false;
std::cout << fmt(
"Attribute name: %s\n" "Attribute name: %s\n"
"Package name: %s\n" "Package name: %s\n"
"Version: %s\n" "Version: %s\n"
@ -240,6 +237,9 @@ struct CmdSearch : SourceExprCommand, MixJSON
if (rename(tmpFile.c_str(), jsonCacheFileName.c_str()) == -1) if (rename(tmpFile.c_str(), jsonCacheFileName.c_str()) == -1)
throw SysError("cannot rename '%s' to '%s'", tmpFile, jsonCacheFileName); throw SysError("cannot rename '%s' to '%s'", tmpFile, jsonCacheFileName);
} }
for (auto el : results) std::cout << el.second << "\n";
} }
}; };