unsupported previews

Cargo.toml

@@ -48,6 +48,7 @@ serde_json = "1.0.125"
 signal-hook = "0.3.17"
 strip-ansi-escapes = "0.2.0"
 strum = { version = "0.26.3", features = ["derive"] }
+syntect = "5.2.0"
 tokio = { version = "1.39.3", features = ["full"] }
 tokio-stream = "0.1.16"
 tokio-util = "0.7.11"

TODO.md

@@ -1,3 +1,15 @@
+# tasks
+- [ ] preview navigation
+- [ ] add a way to open the selected file in the default editor
+- [ ] maybe filter out image types etc. for now
+
+## bugs
+- [ ] sanitize input (tabs, \0, etc)
+
+## improvements
+- [ ] async finder initialization
+- [ ] async finder search
+
 ## feature ideas
 - [x] environment variables
 - [ ] aliases

src/components/channels.rs

@@ -33,6 +33,9 @@ impl TvChannel {
     }
 
     pub fn get_preview(&mut self, entry: &Entry) -> previewers::Preview {
+        if entry.name.is_empty() {
+            return previewers::Preview::default();
+        }
         match self {
             TvChannel::Env(picker) => picker.get_preview(entry),
             TvChannel::Files(picker) => picker.get_preview(entry),

src/components/finders/files.rs

@@ -5,7 +5,6 @@ use std::{
 
 use fuzzy_matcher::skim::SkimMatcherV2;
 use ignore::{types::TypesBuilder, WalkBuilder};
-use tracing::info;
 
 use crate::{
     components::finders::{Entry, Finder},
@@ -31,6 +30,8 @@ impl FileFinder {
     }
 }
 
+const FUZZY_THRESHOLD: i64 = 2;
+
 impl Finder for FileFinder {
     fn find(&mut self, pattern: &str) -> impl Iterator<Item = Entry> {
         let mut results: Vec<Entry> = Vec::new();
@@ -39,11 +40,16 @@ impl Finder for FileFinder {
             results.extend(entries.iter().cloned());
         } else {
             for file in &self.files {
-                let file_name = file.file_name().unwrap().to_string_lossy().to_string();
+                let rel_path = file.strip_prefix(&self.current_directory).unwrap();
+                let rel_path_str = rel_path.to_string_lossy();
                 if !pattern.is_empty() {
-                    if let Some((score, indices)) = self.matcher.fuzzy(&file_name, pattern, true) {
+                    if let Some((score, indices)) = self.matcher.fuzzy(&rel_path_str, pattern, true)
+                    {
+                        if score < FUZZY_THRESHOLD {
+                            continue;
+                        }
                         results.push(Entry {
-                            name: file_name.clone(),
+                            name: rel_path_str.to_string(),
                             display_name: None,
                             preview: None,
                             score,
@@ -70,7 +76,6 @@ fn load_files(path: &Path) -> Vec<PathBuf> {
         let tx = tx.clone();
         Box::new(move |result| {
             if let Ok(entry) = result {
-                info!("found file: {:?}", entry.path());
                 if entry.file_type().unwrap().is_file() {
                     tx.send(entry.path().to_path_buf()).unwrap();
                 }

src/components/previewers.rs

@@ -6,12 +6,14 @@ mod files;
 // previewer types
 pub use env::EnvVarPreviewer;
 pub use files::FilePreviewer;
+use syntect::highlighting::Style;
 
 #[derive(Debug, Clone)]
 pub enum PreviewContent {
     PlainText(String),
     PlainTextWrapped(String),
-    HighlightedText(String),
+    HighlightedText(Vec<Vec<(Style, String)>>),
+    NotSupported,
     Empty,
 }
 
@@ -27,6 +29,15 @@ pub struct Preview {
     pub content: PreviewContent,
 }
 
+impl Default for Preview {
+    fn default() -> Self {
+        Preview {
+            title: String::new(),
+            content: PreviewContent::Empty,
+        }
+    }
+}
+
 /// A trait for a previewer that can preview entries.
 ///
 /// # Methods