forked from lix-project/lix
Alois Wohlschlager
0dd1d8ca1c
Previously, the progress bar had two subtly different states in which the bar would not actually render, both with their own shortcomings: inactive (which was irreversible) and paused (reversible, but swallowing logs). Furthermore, there was no way of resetting the statistics, so a very bad solution was implemented (243c0f18da
) that would create a new logger for each line of the repl, leaking the previous one and discarding the value of printBuildLogs. Finally, if stderr was not attached to a TTY, the update thread was started even though the logger was not active, violating the invariant required by the destructor (which is not observed because the logger is leaked). In this commit, the two aforementioned states are unified into a single one, which can be exited again, correctly upholds the invariant that the update thread is only running while the progress bar is active, and does not swallow logs. The latter change in behavior is not expected to be a problems in the rare cases where the paused state was used before, since other loggers (like the simple one) don't exhibit it anyway. The startProgressBar/stopProgressBar API is removed due to being a footgun, and a new method for properly resetting the progress is added. Co-Authored-By: Qyriad <qyriad@qyriad.me> Change-Id:I2b7c3eb17d439cd0c16f7b896cfb61239ac7ff3a
141 lines
4.3 KiB
C++
141 lines
4.3 KiB
C++
#include "command.hh"
|
|
#include "common-args.hh"
|
|
#include "print-options.hh"
|
|
#include "shared.hh"
|
|
#include "store-api.hh"
|
|
#include "eval.hh"
|
|
#include "eval-inline.hh"
|
|
#include "value-to-json.hh"
|
|
|
|
#include <nlohmann/json.hpp>
|
|
|
|
using namespace nix;
|
|
|
|
struct CmdEval : MixJSON, InstallableCommand, MixReadOnlyOption
|
|
{
|
|
bool raw = false;
|
|
std::optional<std::string> apply;
|
|
std::optional<Path> writeTo;
|
|
|
|
CmdEval() : InstallableCommand()
|
|
{
|
|
addFlag({
|
|
.longName = "raw",
|
|
.description = "Print strings without quotes or escaping.",
|
|
.handler = {&raw, true},
|
|
});
|
|
|
|
addFlag({
|
|
.longName = "apply",
|
|
.description = "Apply the function *expr* to each argument.",
|
|
.labels = {"expr"},
|
|
.handler = {&apply},
|
|
});
|
|
|
|
addFlag({
|
|
.longName = "write-to",
|
|
.description = "Write a string or attrset of strings to *path*.",
|
|
.labels = {"path"},
|
|
.handler = {&writeTo},
|
|
});
|
|
}
|
|
|
|
std::string description() override
|
|
{
|
|
return "evaluate a Nix expression";
|
|
}
|
|
|
|
std::string doc() override
|
|
{
|
|
return
|
|
#include "eval.md"
|
|
;
|
|
}
|
|
|
|
Category category() override { return catSecondary; }
|
|
|
|
void run(ref<Store> store, ref<Installable> installable) override
|
|
{
|
|
if (raw && json)
|
|
throw UsageError("--raw and --json are mutually exclusive");
|
|
|
|
auto const installableValue = InstallableValue::require(installable);
|
|
|
|
auto state = getEvalState();
|
|
|
|
auto [v, pos] = installableValue->toValue(*state);
|
|
NixStringContext context;
|
|
|
|
if (apply) {
|
|
auto vApply = state->allocValue();
|
|
state->eval(state->parseExprFromString(*apply, state->rootPath(CanonPath::fromCwd())), *vApply);
|
|
auto vRes = state->allocValue();
|
|
state->callFunction(*vApply, *v, *vRes, noPos);
|
|
v = vRes;
|
|
}
|
|
|
|
if (writeTo) {
|
|
logger->pause();
|
|
|
|
if (pathExists(*writeTo))
|
|
throw Error("path '%s' already exists", *writeTo);
|
|
|
|
std::function<void(Value & v, const PosIdx pos, const Path & path)> recurse;
|
|
|
|
recurse = [&](Value & v, const PosIdx pos, const Path & path)
|
|
{
|
|
state->forceValue(v, pos);
|
|
if (v.type() == nString)
|
|
// FIXME: disallow strings with contexts?
|
|
writeFile(path, v.string.s);
|
|
else if (v.type() == nAttrs) {
|
|
if (mkdir(path.c_str(), 0777) == -1)
|
|
throw SysError("creating directory '%s'", path);
|
|
for (auto & attr : *v.attrs) {
|
|
std::string_view name = state->symbols[attr.name];
|
|
try {
|
|
if (name == "." || name == "..")
|
|
throw Error("invalid file name '%s'", name);
|
|
recurse(*attr.value, attr.pos, concatStrings(path, "/", name));
|
|
} catch (Error & e) {
|
|
e.addTrace(
|
|
state->positions[attr.pos],
|
|
HintFmt("while evaluating the attribute '%s'", name));
|
|
throw;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
state->error<TypeError>("value at '%s' is not a string or an attribute set", state->positions[pos]).debugThrow();
|
|
};
|
|
|
|
recurse(*v, pos, *writeTo);
|
|
}
|
|
|
|
else if (raw) {
|
|
logger->pause();
|
|
writeFull(STDOUT_FILENO, *state->coerceToString(noPos, *v, context, "while generating the eval command output"));
|
|
}
|
|
|
|
else if (json) {
|
|
logger->cout("%s", printValueAsJSON(*state, true, *v, pos, context, false));
|
|
}
|
|
|
|
else {
|
|
logger->cout(
|
|
"%s",
|
|
ValuePrinter(
|
|
*state,
|
|
*v,
|
|
PrintOptions {
|
|
.force = true,
|
|
.derivationPaths = true,
|
|
.errors = ErrorPrintBehavior::ThrowTopLevel,
|
|
}
|
|
)
|
|
);
|
|
}
|
|
}
|
|
};
|
|
|
|
static auto rCmdEval = registerCommand<CmdEval>("eval");
|