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

nix optimise-store: Add

Browse source 
This replaces "nix-store --optimise". Main difference is that it has a
progress indicator.
This commit is contained in:
Eelco Dolstra 2017-08-16 17:00:24 +02:00
parent 40bffe0a43
commit 23b8b7e096
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 60 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -210,7 +210,7 @@ public:
std::string res;
auto renderActivity = [&](ActivityType type, const std::string & itemFmt, const std::string & numberFmt, double unit) {
auto renderActivity = [&](ActivityType type, const std::string & itemFmt, const std::string & numberFmt = "%d", double unit = 1) {
auto & act = state.activitiesByType[type];
uint64_t done = act.done, expected = act.done, running = 0, failed = act.failed;
for (auto & j : act.its) {
@ -242,16 +242,16 @@ public:
return s;
};
auto showActivity = [&](ActivityType type, const std::string & itemFmt, const std::string & numberFmt, double unit) {
auto showActivity = [&](ActivityType type, const std::string & itemFmt, const std::string & numberFmt = "%d", double unit = 1) {
auto s = renderActivity(type, itemFmt, numberFmt, unit);
if (s.empty()) return;
if (!res.empty()) res += ", ";
res += s;
};
showActivity(actBuilds, "%s built", "%d", 1);
showActivity(actBuilds, "%s built");
auto s1 = renderActivity(actCopyPaths, "%s copied", "%d", 1);
auto s1 = renderActivity(actCopyPaths, "%s copied");
auto s2 = renderActivity(actCopyPath, "%s MiB", "%.1f", MiB);
if (!s1.empty() || !s2.empty()) {
@ -262,6 +262,8 @@ public:
showActivity(actDownload, "%s MiB DL", "%.1f", MiB);
showActivity(actOptimiseStore, "%s paths optimised");
return res;
}
};