Befator-Inc-Firmen-Netzwerk/nix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inline RemoteFSAccessor::makeCacheFile into lambda

Browse Source 
It's just easier to avoid headers.
This commit is contained in:
John Ericson
2026-01-12 23:20:08 -05:00
parent 7ac5a61208
commit 8f829e478f
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libstore/include/nix/store/remote-fs-accessor.hh
View File

@@ -31,8 +31,6 @@ class RemoteFSAccessor : public SourceAccessor
friend struct BinaryCacheStore;
std::filesystem::path makeCacheFile(const Hash & narHash, const std::string & ext);
public:
/**

20
src/libstore/remote-fs-accessor.cc
View File

@@ -18,15 +18,6 @@ RemoteFSAccessor::RemoteFSAccessor(
createDirs(*cacheDir);
}
std::filesystem::path RemoteFSAccessor::makeCacheFile(const Hash & narHash, const std::string & ext)
{
assert(cacheDir);
auto res = *cacheDir / narHash.to_string(HashFormat::Nix32, false);
res += ".";
res += ext;
return res;
}
std::pair<ref<SourceAccessor>, CanonPath> RemoteFSAccessor::fetch(const CanonPath & path)
{
auto [storePath, restPath] = store->toStorePath(store->storeDir + path.abs());
@@ -57,8 +48,15 @@ std::shared_ptr<SourceAccessor> RemoteFSAccessor::accessObject(const StorePath &
};
if (cacheDir) {
auto cacheFile = makeCacheFile(info->narHash, "nar");
auto listingFile = makeCacheFile(info->narHash, "ls");
auto makeCacheFile = [&](const std::string & ext) {
auto res = *cacheDir / info->narHash.to_string(HashFormat::Nix32, false);
res += ".";
res += ext;
return res;
};
auto cacheFile = makeCacheFile("nar");
auto listingFile = makeCacheFile("ls");
if (nix::pathExists(cacheFile)) {
try {