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

Merge pull request #14647 from NixOS/fix-progress-bar

Browse source 
libmain: Fix download progress rendering
This commit is contained in:
John Ericson 2025-11-25 22:52:04 +00:00 • committed by GitHub
commit 6cc44e4fdf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -470,7 +470,8 @@ public:
std::string res; std::string res;
auto renderActivity = auto renderActivity =
[&](ActivityType type, const std::string & itemFmt, const std::string & numberFmt = "%d", double unit = 1) { [&] [[nodiscard]] (
ActivityType type, const std::string & itemFmt, const std::string & numberFmt = "%d", double unit = 1) {
auto & act = state.activitiesByType[type]; auto & act = state.activitiesByType[type];
uint64_t done = act.done, expected = act.done, running = 0, failed = act.failed; uint64_t done = act.done, expected = act.done, running = 0, failed = act.failed;
for (auto & j : act.its) { for (auto & j : act.its) {
@ -514,7 +515,7 @@ public:
return s; return s;
}; };
auto renderSizeActivity = [&](ActivityType type, const std::string & itemFmt = "%s") { auto renderSizeActivity = [&] [[nodiscard]] (ActivityType type, const std::string & itemFmt = "%s") {
auto & act = state.activitiesByType[type]; auto & act = state.activitiesByType[type];
uint64_t done = act.done, expected = act.done, running = 0, failed = act.failed; uint64_t done = act.done, expected = act.done, running = 0, failed = act.failed;
for (auto & j : act.its) { for (auto & j : act.its) {
@ -573,9 +574,7 @@ public:
return s; return s;
}; };
auto showActivity = auto maybeAppendToResult = [&](std::string_view s) {
[&](ActivityType type, const std::string & itemFmt, const std::string & numberFmt = "%d", double unit = 1) {
auto s = renderActivity(type, itemFmt, numberFmt, unit);
if (s.empty()) if (s.empty())
return; return;
if (!res.empty()) if (!res.empty())
@ -583,6 +582,11 @@ public:
res += s; res += s;
}; };
auto showActivity =
[&](ActivityType type, const std::string & itemFmt, const std::string & numberFmt = "%d", double unit = 1) {
maybeAppendToResult(renderActivity(type, itemFmt, numberFmt, unit));
};
showActivity(actBuilds, "%s built"); showActivity(actBuilds, "%s built");
auto s1 = renderActivity(actCopyPaths, "%s copied"); auto s1 = renderActivity(actCopyPaths, "%s copied");
@ -602,7 +606,7 @@ public:
} }
} }
renderSizeActivity(actFileTransfer, "%s DL"); maybeAppendToResult(renderSizeActivity(actFileTransfer, "%s DL"));
{ {
auto s = renderActivity(actOptimiseStore, "%s paths optimised"); auto s = renderActivity(actOptimiseStore, "%s paths optimised");