Eliminate old downloadTarball()

edolstra · Oct 13, 2023 · fa8618f · fa8618f
1 parent e350f84
commit fa8618f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 92 deletions.
diff --git a/src/libcmd/common-eval-args.cc b/src/libcmd/common-eval-args.cc
@@ -169,9 +169,8 @@ Bindings * MixEvalArgs::getAutoArgs(EvalState & state)
 SourcePath lookupFileArg(EvalState & state, std::string_view s)
 {
     if (EvalSettings::isPseudoUrl(s)) {
-        auto storePath = fetchers::downloadTarball(
-            state.store, EvalSettings::resolvePseudoUrl(s), "source", false).storePath;
-        auto accessor = makeStorePathAccessor(state.store, storePath);
+        auto accessor = fetchers::downloadTarball(
+            EvalSettings::resolvePseudoUrl(s)).accessor;
         state.registerAccessor(accessor);
         return accessor->root();
     }

diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
@@ -796,12 +796,11 @@ std::optional<SourcePath> EvalState::resolveSearchPathPath(const SearchPath::Pat
 
     if (EvalSettings::isPseudoUrl(value)) {
         try {
-            auto storePath = fetchers::downloadTarball(
-                store, EvalSettings::resolvePseudoUrl(value), "source", false).storePath;
-            auto accessor = makeStorePathAccessor(store, storePath);
+            auto accessor = fetchers::downloadTarball(
+                EvalSettings::resolvePseudoUrl(value)).accessor;
             registerAccessor(accessor);
             res.emplace(accessor->root());
-        } catch (FileTransferError & e) {
+        } catch (Error & e) {
             logWarning({
                 .msg = hintfmt("Nix search path entry '%1%' cannot be downloaded, ignoring", value)
             });

diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc
@@ -306,7 +306,7 @@ static void fetch(EvalState & state, const PosIdx pos, Value * * args, Value & v
     //       https://github.com/NixOS/nix/issues/4313
     auto storePath =
         unpack
-        ? fetchers::downloadTarball(state.store, *url, name, (bool) expectedHash).storePath
+        ? fetchers::downloadTarball(*url).accessor->fetchToStore(state.store, CanonPath::root, name)
         : fetchers::downloadFile(state.store, *url, name, (bool) expectedHash).storePath;
 
     if (expectedHash) {

diff --git a/src/libfetchers/tarball.cc b/src/libfetchers/tarball.cc
@@ -111,81 +111,9 @@ DownloadFileResult downloadFile(
     };
 }
 
-DownloadTarballResult downloadTarball(
-    ref<Store> store,
-    const std::string & url,
-    const std::string & name,
-    bool locked,
-    const Headers & headers)
-{
-    Attrs inAttrs({
-        {"type", "tarball"},
-        {"url", url},
-        {"name", name},
-    });
-
-    auto cached = getCache()->lookupExpired(store, inAttrs);
-
-    if (cached && !cached->expired)
-        return {
-            .storePath = std::move(cached->storePath),
-            .lastModified = (time_t) getIntAttr(cached->infoAttrs, "lastModified"),
-            .immutableUrl = maybeGetStrAttr(cached->infoAttrs, "immutableUrl"),
-        };
-
-    auto res = downloadFile(store, url, name, locked, headers);
-
-    std::optional<StorePath> unpackedStorePath;
-    time_t lastModified;
-
-    if (cached && res.etag != "" && getStrAttr(cached->infoAttrs, "etag") == res.etag) {
-        unpackedStorePath = std::move(cached->storePath);
-        lastModified = getIntAttr(cached->infoAttrs, "lastModified");
-    } else {
-        Path tmpDir = createTempDir();
-        AutoDelete autoDelete(tmpDir, true);
-        unpackTarfile(store->toRealPath(res.storePath), tmpDir);
-        auto members = readDirectory(tmpDir);
-        if (members.size() != 1)
-            throw nix::Error("tarball '%s' contains an unexpected number of top-level files", url);
-        auto topDir = tmpDir + "/" + members.begin()->name;
-        lastModified = lstat(topDir).st_mtime;
-        unpackedStorePath = store->addToStore(name, topDir, FileIngestionMethod::Recursive, htSHA256, defaultPathFilter, NoRepair);
-    }
-
-    Attrs infoAttrs({
-        {"lastModified", uint64_t(lastModified)},
-        {"etag", res.etag},
-    });
-
-    if (res.immutableUrl)
-        infoAttrs.emplace("immutableUrl", *res.immutableUrl);
-
-    getCache()->add(
-        store,
-        inAttrs,
-        infoAttrs,
-        *unpackedStorePath,
-        locked);
-
-    return {
-        .storePath = std::move(*unpackedStorePath),
-        .lastModified = lastModified,
-        .immutableUrl = res.immutableUrl,
-    };
-}
-
-struct DownloadTarballResult2
-{
-    Hash treeHash;
-    time_t lastModified;
-    std::optional<std::string> immutableUrl;
-};
-
 /* Download and import a tarball into the Git cache. The result is
    the Git tree hash of the root directory. */
-DownloadTarballResult2 downloadTarball2(
-    ref<Store> store,
+DownloadTarballResult downloadTarball(
     const std::string & url,
     const Headers & headers)
 {
@@ -198,10 +126,12 @@ DownloadTarballResult2 downloadTarball2(
 
     auto attrsToResult = [&](const Attrs & infoAttrs)
     {
-        return DownloadTarballResult2 {
-            .treeHash = getRevAttr(infoAttrs, "treeHash"),
+        auto treeHash = getRevAttr(infoAttrs, "treeHash");
+        return DownloadTarballResult {
+            .treeHash = treeHash,
             .lastModified = (time_t) getIntAttr(infoAttrs, "lastModified"),
             .immutableUrl = maybeGetStrAttr(infoAttrs, "immutableUrl"),
+            .accessor = getTarballCache()->getAccessor(treeHash),
         };
     };
 
@@ -389,11 +319,9 @@ struct TarballInputScheme : CurlInputScheme
     {
         auto input(_input);
 
-        auto result = downloadTarball2(store, getStrAttr(input.attrs, "url"), {});
-
-        auto accessor = getTarballCache()->getAccessor(result.treeHash);
+        auto result = downloadTarball(getStrAttr(input.attrs, "url"), {});
 
-        accessor->setPathDisplay("«" + input.to_string() + "»");
+        result.accessor->setPathDisplay("«" + input.to_string() + "»");
 
         if (result.immutableUrl) {
             auto immutableInput = Input::fromURL(*result.immutableUrl);
@@ -410,7 +338,7 @@ struct TarballInputScheme : CurlInputScheme
         input.attrs.insert_or_assign("narHash",
             getTarballCache()->treeHashToNarHash(result.treeHash).to_string(SRI, true));
 
-        return {accessor, input};
+        return {result.accessor, input};
     }
 };
 

diff --git a/src/libfetchers/tarball.hh b/src/libfetchers/tarball.hh
@@ -2,11 +2,13 @@
 
 #include "types.hh"
 #include "path.hh"
+#include "hash.hh"
 
 #include <optional>
 
 namespace nix {
 class Store;
+struct InputAccessor;
 }
 
 namespace nix::fetchers {
@@ -28,16 +30,15 @@ DownloadFileResult downloadFile(
 
 struct DownloadTarballResult
 {
-    StorePath storePath;
+    Hash treeHash;
     time_t lastModified;
     std::optional<std::string> immutableUrl;
+    ref<InputAccessor> accessor;
 };
 
 DownloadTarballResult downloadTarball(
-    ref<Store> store,
     const std::string & url,
-    const std::string & name,
-    bool locked,
     const Headers & headers = {});
 
+
 }