about summary refs log tree commit diff
path: root/tvix/glue
diff options
context:
space:
mode:
authorRyan Lahfa <tvl@lahfa.xyz>2024-01-08T08·50+0100
committerclbot <clbot@tvl.fyi>2024-01-20T18·26+0000
commit4c3ba46ba36b2fa2d9079fcc92ef27875f26418b (patch)
tree0e1115eabc25445a8567661e0fc8866008d8892f /tvix/glue
parent7275288f0e0a0f29c3f023a7d8a4c38157fb637b (diff)
refactor(tvix/store): `import_path` → `import_path_as_nar_ca` r/7432
Add multiple additional helpers such as:

- `path_to_name`: derive the basename of a given path
- `derive_nar_ca_path_info`: derive the `PathInfo` for a content
  addressed NAR

which isolates further the tree walking feature and the ingestion feature.

Additionally, we don't `expect` anymore and propagate properly ingestion errors up.

Change-Id: I60edb5b633911c58ade7e19f5002e6f75f90e262
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10574
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Autosubmit: raitobezarius <tvl@lahfa.xyz>
Diffstat (limited to 'tvix/glue')
-rw-r--r--tvix/glue/src/tvix_store_io.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/tvix/glue/src/tvix_store_io.rs b/tvix/glue/src/tvix_store_io.rs
index c72b5d108504..45bcf0df3ae8 100644
--- a/tvix/glue/src/tvix_store_io.rs
+++ b/tvix/glue/src/tvix_store_io.rs
@@ -274,7 +274,7 @@ impl EvalIO for TvixStoreIO {
     #[instrument(skip(self), ret, err)]
     fn import_path(&self, path: &Path) -> io::Result<PathBuf> {
         let output_path = self.tokio_handle.block_on(async {
-            tvix_store::utils::import_path(
+            tvix_store::import::import_path_as_nar_ca(
                 path,
                 &self.blob_service,
                 &self.directory_service,