nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-21 09:49:36 +01:00
Code Activity

Fix crash, tweaks

Browse source
This commit is contained in:
Eelco Dolstra 2020-11-13 12:59:29 +01:00
parent f90b12098d
commit 4b711bf3ce
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libmain/progress-bar.cc
View file

@ -99,7 +99,7 @@ private:
stats.expected += j.second->expected; stats.expected += j.second->expected;
stats.running += j.second->running; stats.running += j.second->running;
stats.failed += j.second->failed; stats.failed += j.second->failed;
stats.left += j.second->expected - j.second->done; stats.left += j.second->expected > j.second->done ? j.second->expected - j.second->done : 0;
} }
stats.expected = std::max(stats.expected, act.expected); stats.expected = std::max(stats.expected, act.expected);
@ -113,7 +113,8 @@ private:
idDownload, idDownload,
idCopyPaths, idCopyPaths,
idBuilds, idBuilds,
idStatus idStatus,
idQuit
}; };
typedef std::pair<StatusLineGroup, uint16_t> LineId; typedef std::pair<StatusLineGroup, uint16_t> LineId;
@ -221,8 +222,10 @@ public:
c = std::tolower(c); c = std::tolower(c);
if (c == 3 || c == 'q') { if (c == 3 || c == 'q') {
auto state(state_.lock());
state->statusLines.insert_or_assign({idQuit, 0}, ANSI_RED "Exiting...");
draw(*state);
triggerInterrupt(); triggerInterrupt();
break;
} }
if (c == 'l') { if (c == 'l') {
auto state(state_.lock()); auto state(state_.lock());
@ -544,7 +547,8 @@ public:
} }
removeStatusLines(state, idStatus); removeStatusLines(state, idStatus);
state.statusLines.insert_or_assign({idStatus, 0}, line); if (line != "")
state.statusLines.insert_or_assign({idStatus, 0}, line);
if (state.activitiesByType.count(actEvaluate)) { if (state.activitiesByType.count(actEvaluate)) {
if (!state.activitiesByType[actEvaluate].its.empty()) { if (!state.activitiesByType[actEvaluate].its.empty()) {
@ -565,10 +569,12 @@ public:
auto pct1 = std::min((double) failed / expected, 1.0); auto pct1 = std::min((double) failed / expected, 1.0);
auto pct2 = std::min((double) (failed + done) / expected, 1.0); auto pct2 = std::min((double) (failed + done) / expected, 1.0);
auto pct3 = std::min((double) (failed + done + running) / expected, 1.0); auto pct3 = std::min((double) (failed + done + running) / expected, 1.0);
auto barLength = 60; auto barLength = 70;
size_t chars1 = barLength * pct1; size_t chars1 = barLength * pct1;
size_t chars2 = barLength * pct2; size_t chars2 = barLength * pct2;
size_t chars3 = barLength * pct3; size_t chars3 = barLength * pct3;
assert(chars1 <= chars2);
assert(chars2 <= chars3);
return return
ANSI_RED + repeat("█", chars1) + ANSI_RED + repeat("█", chars1) +
ANSI_GREEN + repeat("█", chars2 - chars1) + ANSI_GREEN + repeat("█", chars2 - chars1) +