From 080654aaf9bd2f94d634008afd1dc26c74752eec Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 25 Jun 2024 20:37:43 +0300 Subject: feat(tvix/eval): add file_type method This allows peeking of the type at a given path. It's necessary, as an open() might not fail until you try to read() from it, and generally, stat'ing can be faster in some cases. Change-Id: Ib002da3194a3546ca286de49aac8d1022ec5560f Reviewed-on: https://cl.tvl.fyi/c/depot/+/11871 Tested-by: BuildkiteCI Reviewed-by: Ilan Joselevich Reviewed-by: Connor Brewster --- tvix/glue/src/tvix_io.rs | 4 ++++ tvix/glue/src/tvix_store_io.rs | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) (limited to 'tvix/glue') diff --git a/tvix/glue/src/tvix_io.rs b/tvix/glue/src/tvix_io.rs index 0e5f23b99093..db0c2cef77aa 100644 --- a/tvix/glue/src/tvix_io.rs +++ b/tvix/glue/src/tvix_io.rs @@ -60,6 +60,10 @@ where self.actual.as_ref().open(path) } + fn file_type(&self, path: &Path) -> io::Result { + self.actual.as_ref().file_type(path) + } + fn read_dir(&self, path: &Path) -> io::Result> { self.actual.as_ref().read_dir(path) } diff --git a/tvix/glue/src/tvix_store_io.rs b/tvix/glue/src/tvix_store_io.rs index 489f020436c7..dd034d74bf3e 100644 --- a/tvix/glue/src/tvix_store_io.rs +++ b/tvix/glue/src/tvix_store_io.rs @@ -531,6 +531,28 @@ impl EvalIO for TvixStoreIO { } } + #[instrument(skip(self), ret(level = Level::TRACE), err)] + fn file_type(&self, path: &Path) -> io::Result { + if let Ok((store_path, sub_path)) = + StorePath::from_absolute_path_full(&path.to_string_lossy()) + { + if let Some(node) = self + .tokio_handle + .block_on(async { self.store_path_to_node(&store_path, &sub_path).await })? + { + match node { + Node::Directory(_) => Ok(FileType::Directory), + Node::File(_) => Ok(FileType::Regular), + Node::Symlink(_) => Ok(FileType::Symlink), + } + } else { + self.std_io.file_type(path) + } + } else { + self.std_io.file_type(path) + } + } + #[instrument(skip(self), ret(level = Level::TRACE), err)] fn read_dir(&self, path: &Path) -> io::Result> { if let Ok((store_path, sub_path)) = -- cgit 1.4.1