From a0c5931208042da39bb6a5e80a4b27cf50f665d6 Mon Sep 17 00:00:00 2001
From: Nikola Knezevic <nikola@knezevic.ch>
Date: Mon, 6 Apr 2020 23:08:39 +0200
Subject: [PATCH] actDownload -> actDataTransfer

---
 src/libstore/build.cc        | 2 +-
 src/libstore/datatransfer.cc | 2 +-
 src/libutil/logging.cc       | 2 +-
 src/libutil/logging.hh       | 2 +-
 src/nix/progress-bar.cc      | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index db01d9510..f091a000d 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -361,7 +361,7 @@ public:
     {
         actDerivations.progress(doneBuilds, expectedBuilds + doneBuilds, runningBuilds, failedBuilds);
         actSubstitutions.progress(doneSubstitutions, expectedSubstitutions + doneSubstitutions, runningSubstitutions, failedSubstitutions);
-        act.setExpected(actDownload, expectedDownloadSize + doneDownloadSize);
+        act.setExpected(actDataTransfer, expectedDownloadSize + doneDownloadSize);
         act.setExpected(actCopyPath, expectedNarSize + doneNarSize);
     }
 };
diff --git a/src/libstore/datatransfer.cc b/src/libstore/datatransfer.cc
index be5dd27cd..9ed06b5c1 100644
--- a/src/libstore/datatransfer.cc
+++ b/src/libstore/datatransfer.cc
@@ -77,7 +77,7 @@ struct curlDataTransfer : public DataTransfer
             Callback<DataTransferResult> && callback)
             : dataTransfer(dataTransfer)
             , request(request)
-            , act(*logger, lvlTalkative, actDownload,
+            , act(*logger, lvlTalkative, actDataTransfer,
                 fmt(request.data ? "uploading '%s'" : "downloading '%s'", request.uri),
                 {request.uri}, request.parentAct)
             , callback(std::move(callback))
diff --git a/src/libutil/logging.cc b/src/libutil/logging.cc
index fa5c84a27..001a3fb28 100644
--- a/src/libutil/logging.cc
+++ b/src/libutil/logging.cc
@@ -198,7 +198,7 @@ bool handleJSONLogMessage(const std::string & msg,
 
         if (action == "start") {
             auto type = (ActivityType) json["type"];
-            if (trusted || type == actDownload)
+            if (trusted || type == actDataTransfer)
                 activities.emplace(std::piecewise_construct,
                     std::forward_as_tuple(json["id"]),
                     std::forward_as_tuple(*logger, (Verbosity) json["level"], type,
diff --git a/src/libutil/logging.hh b/src/libutil/logging.hh
index beb5e6b64..423ed95da 100644
--- a/src/libutil/logging.hh
+++ b/src/libutil/logging.hh
@@ -17,7 +17,7 @@ typedef enum {
 typedef enum {
     actUnknown = 0,
     actCopyPath = 100,
-    actDownload = 101,
+    actDataTransfer = 101,
     actRealise = 102,
     actCopyPaths = 103,
     actBuilds = 104,
diff --git a/src/nix/progress-bar.cc b/src/nix/progress-bar.cc
index 26631416c..d108896ad 100644
--- a/src/nix/progress-bar.cc
+++ b/src/nix/progress-bar.cc
@@ -190,8 +190,8 @@ public:
             i->s = fmt("querying " ANSI_BOLD "%s" ANSI_NORMAL " on %s", name, getS(fields, 1));
         }
 
-        if ((type == actDownload && hasAncestor(*state, actCopyPath, parent))
-            || (type == actDownload && hasAncestor(*state, actQueryPathInfo, parent))
+        if ((type == actDataTransfer && hasAncestor(*state, actCopyPath, parent))
+            || (type == actDataTransfer && hasAncestor(*state, actQueryPathInfo, parent))
             || (type == actCopyPath && hasAncestor(*state, actSubstitute, parent)))
             i->visible = false;
 
@@ -416,7 +416,7 @@ public:
             if (!s2.empty()) { res += " ("; res += s2; res += ')'; }
         }
 
-        showActivity(actDownload, "%s MiB DL", "%.1f", MiB);
+        showActivity(actDataTransfer, "%s MiB DL", "%.1f", MiB);
 
         {
             auto s = renderActivity(actOptimiseStore, "%s paths optimised");