Remove tarball-cache.{hh,cc}

TarballInfo is only used in github.cc, and getTarballCache() is a bit too trivial to have its own file.
NixOS · Feb 15, 2024 · 78b8db7 · 78b8db7
1 parent 9b04ce1
commit 78b8db7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 31 deletions.
diff --git a/src/libfetchers/git-utils.cc b/src/libfetchers/git-utils.cc
@@ -986,4 +986,11 @@ std::vector<std::tuple<GitRepoImpl::Submodule, Hash>> GitRepoImpl::getSubmodules
     return result;
 }
 
+ref<GitRepo> getTarballCache()
+{
+    static auto repoDir = std::filesystem::path(getCacheDir()) / "nix" / "tarball-cache";
+
+    return GitRepo::openRepo(repoDir, true, true);
+}
+
 }
diff --git a/src/libfetchers/git-utils.hh b/src/libfetchers/git-utils.hh
@@ -95,4 +95,6 @@ struct GitRepo
         const std::vector<fetchers::PublicKey> & publicKeys) = 0;
 };
 
+ref<GitRepo> getTarballCache();
+
 }
diff --git a/src/libfetchers/github.cc b/src/libfetchers/github.cc
@@ -10,7 +10,6 @@
 #include "tarball.hh"
 #include "tarfile.hh"
 #include "git-utils.hh"
-#include "tarball-cache.hh"
 
 #include <optional>
 #include <nlohmann/json.hpp>
@@ -193,6 +192,12 @@ struct GitArchiveInputScheme : InputScheme
 
     virtual DownloadUrl getDownloadUrl(const Input & input) const = 0;
 
+    struct TarballInfo
+    {
+        Hash treeHash;
+        time_t lastModified;
+    };
+
     std::pair<Input, TarballInfo> downloadArchive(ref<Store> store, Input input) const
     {
         if (!maybeGetStrAttr(input.attrs, "ref")) input.attrs.insert_or_assign("ref", "HEAD");

diff --git a/src/libfetchers/tarball-cache.cc b/src/libfetchers/tarball-cache.cc
diff --git a/src/libfetchers/tarball-cache.hh b/src/libfetchers/tarball-cache.hh
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,4 +95,6 @@ struct GitRepo @@
             const std::vector<fetchers::PublicKey> & publicKeys) = 0;
     };
+    ref<GitRepo> getTarballCache();
     }