feat: added unit tests for indexing

pamburus · Dec 15, 2024 · 27b5bee · 27b5bee
1 parent 1bb8586
commit 27b5bee
Show file tree

Hide file tree

Showing 9 changed files with 787 additions and 217 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -89,6 +89,7 @@ kqueue = "1"
 
 [dev-dependencies]
 byte-strings = "0"
+clean-path = "0"
 criterion = "0"
 maplit = "1"
 mockall = "0"

diff --git a/src/app.rs b/src/app.rs
@@ -40,6 +40,7 @@ use crate::{
     settings::{FieldShowOption, Fields, Formatting},
     theme::{Element, StylingPush, Theme},
     timezone::Tz,
+    vfs::LocalFileSystem,
     IncludeExcludeKeyFilter,
     {error::*, QueryNone},
 };
@@ -272,6 +273,7 @@ impl App {
     fn sort(&self, inputs: Vec<InputHolder>, output: &mut Output) -> Result<()> {
         let mut output = BufWriter::new(output);
         let indexer_settings = IndexerSettings::new(
+            LocalFileSystem,
             self.options.buffer_size.try_into()?,
             self.options.max_message_size.try_into()?,
             &self.options.fields.settings.predefined,
@@ -499,8 +501,8 @@ impl App {
                 let reader = scope.spawn(closure!(clone sfi, clone txi, |_| -> Result<()> {
                     let scanner = Scanner::new(sfi.clone(), &self.options.delimiter);
                     let mut meta = None;
-                    if let InputReference::File(filename) = &input_ref {
-                        meta = Some(fs::metadata(filename)?);
+                    if let InputReference::File(path) = &input_ref {
+                        meta = Some(fs::metadata(&path.canonical)?);
                     }
                     let mut input = Some(input_ref.open()?.tail(self.options.tail)?);
                     let is_file = |meta: &Option<fs::Metadata>| meta.as_ref().map(|m|m.is_file()).unwrap_or(false);
@@ -516,14 +518,14 @@ impl App {
                             Ok(false)
                         }
                     };
-                    if let InputReference::File(filename) = &input_ref {
+                    if let InputReference::File(path) = &input_ref {
                         if process(&mut input, is_file(&meta))? {
                             return Ok(())
                         }
-                        fsmon::run(vec![filename.clone()], |event| {
+                        fsmon::run(vec![path.canonical.clone()], |event| {
                             match event.kind {
                                 EventKind::Modify(_) | EventKind::Create(_) | EventKind::Any | EventKind::Other => {
-                                    if let (Some(old_meta), Ok(new_meta)) = (&meta, fs::metadata(&filename)) {
+                                    if let (Some(old_meta), Ok(new_meta)) = (&meta, fs::metadata(&path.canonical)) {
                                         if old_meta.len() > new_meta.len() {
                                             input = None;
                                         }
@@ -691,7 +693,7 @@ impl App {
     fn input_badges<'a, I: IntoIterator<Item = &'a InputReference>>(&self, inputs: I) -> Option<Vec<String>> {
         let name = |input: &InputReference| match input {
             InputReference::Stdin => "<stdin>".to_owned(),
-            InputReference::File(path) => path.to_string_lossy().to_string(),
+            InputReference::File(path) => path.original.to_string_lossy().to_string(),
         };
 
         let mut badges = inputs.into_iter().map(|x| name(x).chars().collect_vec()).collect_vec();