From dd0412d1b49a86e4f3de45bf72415d8d75f5fd57 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 24 Jul 2024 20:22:26 +0200
Subject: [PATCH] Show when we're unpacking an archive into the Git cache

This happens in parallel with the download (which starts later), so
you only see this message when the download has finished but the
import hasn't.

(cherry picked from commit 01839b525c5e80d7f67f2808f7f7fb478ddf1ba0)
---
 src/libfetchers/github.cc  | 5 +++++
 src/libfetchers/tarball.cc | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/libfetchers/github.cc b/src/libfetchers/github.cc
index ddb41e63f..a17a6ea54 100644
--- a/src/libfetchers/github.cc
+++ b/src/libfetchers/github.cc
@@ -248,10 +248,15 @@ struct GitArchiveInputScheme : InputScheme
             getFileTransfer()->download(std::move(req), sink);
         });
 
+        auto act = std::make_unique<Activity>(*logger, lvlInfo, actUnknown,
+            fmt("unpacking '%s' into the Git cache", input.to_string()));
+
         TarArchive archive { *source };
         auto parseSink = getTarballCache()->getFileSystemObjectSink();
         auto lastModified = unpackTarfileToSink(archive, *parseSink);
 
+        act.reset();
+
         TarballInfo tarballInfo {
             .treeHash = parseSink->sync(),
             .lastModified = lastModified
diff --git a/src/libfetchers/tarball.cc b/src/libfetchers/tarball.cc
index aa8ff652f..9e9038deb 100644
--- a/src/libfetchers/tarball.cc
+++ b/src/libfetchers/tarball.cc
@@ -145,6 +145,9 @@ DownloadTarballResult downloadTarball(
 
     // TODO: fall back to cached value if download fails.
 
+    auto act = std::make_unique<Activity>(*logger, lvlInfo, actUnknown,
+        fmt("unpacking '%s' into the Git cache", url));
+
     AutoDelete cleanupTemp;
 
     /* Note: if the download is cached, `importTarball()` will receive
@@ -169,6 +172,8 @@ DownloadTarballResult downloadTarball(
     auto parseSink = getTarballCache()->getFileSystemObjectSink();
     auto lastModified = unpackTarfileToSink(archive, *parseSink);
 
+    act.reset();
+
     auto res(_res->lock());
 
     Attrs infoAttrs;