guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libstore: convert dumpPath to a generator

Browse Source 
Change-Id: Ic4cf5562504aa29130304469936f958c0426e5ef
This commit is contained in:
eldritch horrors
2024-07-05 22:28:16 +00:00
parent b51ea465de
commit 06220a71c1
19 changed files with 80 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstore/binary-cache-store.cc
+4 -6
View File
@@ -383,16 +383,14 @@ StorePath BinaryCacheStore::addToStore(
HashSink sink { hashAlgo };
if (method == FileIngestionMethod::Recursive) {
dumpPath(srcPath, sink, filter);
sink << dumpPath(srcPath, filter);
} else {
readFileSource(srcPath)->drainInto(sink);
}
auto h = sink.finish().first;
auto source = sinkToSource([&](Sink & sink) {
dumpPath(srcPath, sink, filter);
});
return addToStoreCommon(*source, repair, CheckSigs, [&](HashResult nar) {
auto source = GeneratorSource{dumpPath(srcPath, filter)};
return addToStoreCommon(source, repair, CheckSigs, [&](HashResult nar) {
ValidPathInfo info {
*this,
name,
@@ -425,7 +423,7 @@ StorePath BinaryCacheStore::addTextToStore(
return path;
StringSink sink;
dumpString(s, sink);
sink << dumpString(s);
StringSource source(sink.s);
return addToStoreCommon(source, repair, CheckSigs, [&](HashResult nar) {
ValidPathInfo info {