maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add an activity for binary cache queries

Browse source
This commit is contained in:
Eelco Dolstra 2017-08-31 15:25:58 +02:00
parent c2154d4c84
commit fd73c1e20a
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/nix/progress-bar.cc
View file

@ -138,11 +138,11 @@ public:
void startActivity(ActivityId act, Verbosity lvl, ActivityType type,
const std::string & s, const Fields & fields, ActivityId parent) override
{
if (lvl <= verbosity && !s.empty())
log(lvl, s + "...");
auto state(state_.lock());
if (lvl <= verbosity && !s.empty())
log(*state, lvl, s + "...");
state->activities.emplace_back(ActInfo());
auto i = std::prev(state->activities.end());
i->s = s;
@ -163,7 +163,13 @@ public:
i->s = fmt("fetching " ANSI_BOLD "%s" ANSI_NORMAL " from %s", name, getS(fields, 1));
}
if (type == actQueryPathInfo) {
auto name = storePathToName(getS(fields, 0));
i->s = fmt("querying about " ANSI_BOLD "%s" ANSI_NORMAL " on %s", name, getS(fields, 1));
}
if ((type == actDownload && hasAncestor(*state, actCopyPath, parent))
|| (type == actDownload && hasAncestor(*state, actQueryPathInfo, parent))
|| (type == actCopyPath && hasAncestor(*state, actSubstitute, parent)))
i->visible = false;
@ -189,6 +195,7 @@ public:
auto i = state->its.find(act);
if (i != state->its.end()) {
auto & actByType = state->activitiesByType[i->second->type];
actByType.done += i->second->done;
actByType.failed += i->second->failed;