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

Progress indicator: Show number of active items

Browse source
This commit is contained in:
Eelco Dolstra 2017-08-14 22:42:17 +02:00
parent 0e0dcf2c7e
commit bf1f123b09
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
7 changed files with 39 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@ private:
ActivityType type = actUnknown;
uint64_t done = 0;
uint64_t expected = 0;
uint64_t running = 0;
std::map<ActivityType, uint64_t> expectedByType;
};
@ -174,19 +175,20 @@ public:
auto showActivity = [&](ActivityType type, const std::string & f, double unit) {
auto & act = state.activitiesByType[type];
uint64_t done = act.done, expected = act.done;
uint64_t done = act.done, expected = act.done, running = 0;
for (auto & j : act.its) {
done += j.second->done;
expected += j.second->expected;
running += j.second->running;
}
expected = std::max(expected, act.expected);
if (done || expected)
add(fmt(f, done / unit, expected / unit));
add(fmt(f, done / unit, expected / unit, running));
};
showActivity(actCopyPaths, ANSI_GREEN "%d" ANSI_NORMAL "/%d copied", 1);
showActivity(actCopyPaths, ANSI_BLUE "%3$d" ANSI_NORMAL "/" ANSI_GREEN "%1$d" ANSI_NORMAL "/%2$d copied", 1);
showActivity(actDownload, "%1$.1f/%2$.1f MiB DL", MiB);
showActivity(actCopyPath, "%1$.1f/%2$.1f MiB copied", MiB);
@ -213,6 +215,7 @@ public:
ActInfo & actInfo = *i->second;
actInfo.done = ev.getI(1);
actInfo.expected = ev.getI(2);
actInfo.running = ev.getI(3);
}
if (ev.type == evSetExpected) {