From 7a086a32bce3338bdc1ce669a51599a99bc17b9f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 20 Oct 2023 13:32:15 +0200
Subject: [PATCH] fetchToStore(): Handle flat ingestion method and add test

---
 src/libfetchers/input-accessor.cc        |  5 ++++-
 tests/functional/lang/eval-okay-path.exp |  2 +-
 tests/functional/lang/eval-okay-path.nix | 22 +++++++++++++++-------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/libfetchers/input-accessor.cc b/src/libfetchers/input-accessor.cc
index 9bddf7c2e..488350849 100644
--- a/src/libfetchers/input-accessor.cc
+++ b/src/libfetchers/input-accessor.cc
@@ -14,7 +14,10 @@ StorePath InputAccessor::fetchToStore(
     Activity act(*logger, lvlChatty, actUnknown, fmt("copying '%s' to the store", showPath(path)));
 
     auto source = sinkToSource([&](Sink & sink) {
-        dumpPath(path, sink, filter ? *filter : defaultPathFilter);
+        if (method == FileIngestionMethod::Recursive)
+            dumpPath(path, sink, filter ? *filter : defaultPathFilter);
+        else
+            sink(readFile(path)); // FIXME: stream
     });
 
     auto storePath =
diff --git a/tests/functional/lang/eval-okay-path.exp b/tests/functional/lang/eval-okay-path.exp
index 3ce7f8283..635e2243a 100644
--- a/tests/functional/lang/eval-okay-path.exp
+++ b/tests/functional/lang/eval-okay-path.exp
@@ -1 +1 @@
-"/nix/store/ya937r4ydw0l6kayq8jkyqaips9c75jm-output"
+[ "/nix/store/ya937r4ydw0l6kayq8jkyqaips9c75jm-output" "/nix/store/m7y372g6jb0g4hh1dzmj847rd356fhnz-output" ]
diff --git a/tests/functional/lang/eval-okay-path.nix b/tests/functional/lang/eval-okay-path.nix
index e67168cf3..599b33541 100644
--- a/tests/functional/lang/eval-okay-path.nix
+++ b/tests/functional/lang/eval-okay-path.nix
@@ -1,7 +1,15 @@
-builtins.path
-  { path = ./.;
-    filter = path: _: baseNameOf path == "data";
-    recursive = true;
-    sha256 = "1yhm3gwvg5a41yylymgblsclk95fs6jy72w0wv925mmidlhcq4sw";
-    name = "output";
-  }
+[
+  (builtins.path
+    { path = ./.;
+      filter = path: _: baseNameOf path == "data";
+      recursive = true;
+      sha256 = "1yhm3gwvg5a41yylymgblsclk95fs6jy72w0wv925mmidlhcq4sw";
+      name = "output";
+    })
+  (builtins.path
+    { path = ./data;
+      recursive = false;
+      sha256 = "0k4lwj58f2w5yh92ilrwy9917pycipbrdrr13vbb3yd02j09vfxm";
+      name = "output";
+    })
+]