From e6ca275e231d402c2e0a28da012b792f881209ae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 18 Nov 2020 18:16:47 +0100
Subject: [PATCH] Show queryMissing() in the progress bar

---
 src/libmain/progress-bar.cc | 33 ++++++++++++++++++++++-----------
 src/libstore/misc.cc        |  2 +-
 src/libutil/logging.hh      |  1 +
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/libmain/progress-bar.cc b/src/libmain/progress-bar.cc
index cc06dfed0..28692f2a1 100644
--- a/src/libmain/progress-bar.cc
+++ b/src/libmain/progress-bar.cc
@@ -87,6 +87,7 @@ private:
         uint64_t running = 0;
         uint64_t failed = 0;
         uint64_t left = 0;
+        uint64_t active = 0;
     };
 
     ActivityStats getActivityStats(ActivitiesByType & act)
@@ -105,6 +106,7 @@ private:
             stats.running += j.second->running;
             stats.failed += j.second->failed;
             stats.left += j.second->expected > j.second->done ? j.second->expected - j.second->done : 0;
+            stats.active++;
         }
 
         stats.expected = std::max(stats.expected, act.expected);
@@ -115,8 +117,9 @@ private:
     enum StatusLineGroup {
         idHelp,
         idLockFlake,
-        idEvaluate,
         idDownload,
+        idEvaluate,
+        idQueryMissing,
         idCopyPaths,
         idBuilds,
         idStatus,
@@ -449,7 +452,8 @@ public:
             || (type == actCopyPath && hasAncestor(*state, actSubstitute, parent)) // FIXME?
             || type == actBuild
             || type == actSubstitute
-            || type == actLockFlake)
+            || type == actLockFlake
+            || type == actQueryMissing)
             i->visible = false;
 
         if (type == actBuild)
@@ -611,7 +615,7 @@ public:
 
         if (state.activitiesByType.count(actEvaluate)) {
             state.statusLines.insert_or_assign({idEvaluate, 0},
-                fmt("%s Evaluating",
+                fmt("%s Evaluate",
                     state.activitiesByType[actEvaluate].its.empty()
                     ? doneMark : busyMark));
             state.statusLines.insert_or_assign({idEvaluate, 1}, "");
@@ -619,12 +623,20 @@ public:
 
         if (state.activitiesByType.count(actLockFlake)) {
             state.statusLines.insert_or_assign({idLockFlake, 0},
-                fmt("%s Locking flake inputs",
+                fmt("%s Lock flake inputs",
                     state.activitiesByType[actLockFlake].its.empty()
                     ? doneMark : busyMark));
             state.statusLines.insert_or_assign({idLockFlake, 1}, "");
         }
 
+        if (state.activitiesByType.count(actQueryMissing)) {
+            state.statusLines.insert_or_assign({idQueryMissing, 0},
+                fmt("%s Query missing paths",
+                    state.activitiesByType[actQueryMissing].its.empty()
+                    ? doneMark : busyMark));
+            state.statusLines.insert_or_assign({idQueryMissing, 1}, "");
+        }
+
         auto renderBar = [](uint64_t done, uint64_t failed, uint64_t running, uint64_t expected)
         {
             expected = std::max(expected, (uint64_t) 1);
@@ -651,11 +663,10 @@ public:
 
             size_t n = 0;
             state.statusLines.insert_or_assign({idDownload, n++},
-                fmt("%s Downloaded %.1f / %.1f MiB",
-                    fileTransfer.running || fileTransfer.done < fileTransfer.expected
-                    ? ANSI_BOLD "•"
-                    : ANSI_GREEN "✓",
-                    //copyPaths.done, copyPaths.expected,
+                fmt("%s Download %.1f / %.1f MiB",
+                    fileTransfer.active || fileTransfer.done < fileTransfer.expected
+                    ? busyMark
+                    : doneMark,
                     fileTransfer.done / MiB, fileTransfer.expected / MiB));
 
             state.statusLines.insert_or_assign({idDownload, n++},
@@ -680,7 +691,7 @@ public:
 
             size_t n = 0;
             state.statusLines.insert_or_assign({idCopyPaths, n++},
-                fmt("%s Fetched %d / %d store paths, %.1f / %.1f MiB",
+                fmt("%s Fetch %d / %d store paths, %.1f / %.1f MiB",
                     copyPaths.running || copyPaths.done < copyPaths.expected
                     ? busyMark
                     : doneMark,
@@ -706,7 +717,7 @@ public:
             size_t n = 0;
             state.statusLines.insert_or_assign(
                 {idBuilds, n++},
-                fmt("%s Built %d / %d derivations",
+                fmt("%s Build %d / %d derivations",
                     builds.failed
                     ? ANSI_RED "✗"
                     : builds.running || builds.done < builds.expected
diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc
index ad4dccef9..dc79d5b07 100644
--- a/src/libstore/misc.cc
+++ b/src/libstore/misc.cc
@@ -123,7 +123,7 @@ void Store::queryMissing(const std::vector<StorePathWithOutputs> & targets,
     StorePathSet & willBuild_, StorePathSet & willSubstitute_, StorePathSet & unknown_,
     uint64_t & downloadSize_, uint64_t & narSize_)
 {
-    Activity act(*logger, lvlDebug, actUnknown, "querying info about missing paths");
+    Activity act(*logger, lvlDebug, actQueryMissing, "querying info about missing paths");
 
     downloadSize_ = narSize_ = 0;
 
diff --git a/src/libutil/logging.hh b/src/libutil/logging.hh
index 0467f3b38..fca23fc7c 100644
--- a/src/libutil/logging.hh
+++ b/src/libutil/logging.hh
@@ -22,6 +22,7 @@ typedef enum {
     actBuildWaiting = 111,
     actEvaluate = 112,
     actLockFlake = 113,
+    actQueryMissing = 114,
 } ActivityType;
 
 typedef enum {