feat(channels): add support for multi selection (#234)

Fixes #229 <img width="1793" alt="Screenshot 2025-01-07 at 00 12 18" src="https://github.com/user-attachments/assets/f2158c70-b3ab-4c14-8856-eb8463efef8a" />
alexpasmantier · Jan 6, 2025 · 2e5f65b · 2e5f65b
1 parent d207848
commit 2e5f65b
Show file tree

Hide file tree

Showing 34 changed files with 471 additions and 73 deletions.
diff --git a/.config/config.toml b/.config/config.toml
@@ -83,8 +83,12 @@ select_prev_page = "pageup"
 # Scrolling the preview pane
 scroll_preview_half_page_down = "ctrl-d"
 scroll_preview_half_page_up = "ctrl-u"
-# Select an entry
-select_entry = "enter"
+# Add entry to selection and move to the next entry
+toggle_selection_down = "tab"
+# Add entry to selection and move to the previous entry
+toggle_selection_up = "backtab"
+# Confirm selection
+confirm_selection = "enter"
 # Copy the selected entry to the clipboard
 copy_entry_to_clipboard = "ctrl-y"
 # Toggle the remote control mode

diff --git a/crates/television-channels/src/channels.rs b/crates/television-channels/src/channels.rs
@@ -1,3 +1,5 @@
+use std::collections::HashSet;
+
 use crate::entry::Entry;
 use color_eyre::Result;
 use television_derive::{Broadcast, ToCliChannel, ToUnitChannel};
@@ -65,6 +67,12 @@ pub trait OnAir: Send {
     /// Get a specific result by its index.
     fn get_result(&self, index: u32) -> Option<Entry>;
 
+    /// Get the currently selected entries.
+    fn selected_entries(&self) -> &HashSet<Entry>;
+
+    /// Toggles selection for the entry under the cursor.
+    fn toggle_selection(&mut self, entry: &Entry);
+
     /// Get the number of results currently available.
     fn result_count(&self) -> u32;
 

diff --git a/crates/television-channels/src/channels/alias.rs b/crates/television-channels/src/channels/alias.rs
@@ -1,3 +1,5 @@
+use std::collections::HashSet;
+
 use crate::channels::OnAir;
 use crate::entry::Entry;
 use crate::entry::PreviewType;
@@ -21,6 +23,7 @@ impl Alias {
 pub struct Channel {
     matcher: Matcher<Alias>,
     file_icon: FileIcon,
+    selected_entries: HashSet<Entry>,
 }
 
 const NUM_THREADS: usize = 1;
@@ -52,6 +55,7 @@ impl Channel {
         Self {
             matcher,
             file_icon: FileIcon::from(FILE_ICON_STR),
+            selected_entries: HashSet::new(),
         }
     }
 }
@@ -115,6 +119,18 @@ impl OnAir for Channel {
         })
     }
 
+    fn selected_entries(&self) -> &HashSet<Entry> {
+        &self.selected_entries
+    }
+
+    fn toggle_selection(&mut self, entry: &Entry) {
+        if self.selected_entries.contains(entry) {
+            self.selected_entries.remove(entry);
+        } else {
+            self.selected_entries.insert(entry.clone());
+        }
+    }
+
     fn result_count(&self) -> u32 {
         self.matcher.matched_item_count
     }

diff --git a/crates/television-channels/src/channels/cable.rs b/crates/television-channels/src/channels/cable.rs
@@ -26,6 +26,7 @@ pub struct Channel {
     matcher: Matcher<String>,
     entries_command: String,
     preview_kind: PreviewKind,
+    selected_entries: HashSet<Entry>,
 }
 
 impl Default for Channel {
@@ -93,6 +94,7 @@ impl Channel {
             entries_command: entries_command.to_string(),
             preview_kind,
             name: name.to_string(),
+            selected_entries: HashSet::new(),
         }
     }
 }
@@ -162,6 +164,18 @@ impl OnAir for Channel {
         })
     }
 
+    fn selected_entries(&self) -> &HashSet<Entry> {
+        &self.selected_entries
+    }
+
+    fn toggle_selection(&mut self, entry: &Entry) {
+        if self.selected_entries.contains(entry) {
+            self.selected_entries.remove(entry);
+        } else {
+            self.selected_entries.insert(entry.clone());
+        }
+    }
+
     fn result_count(&self) -> u32 {
         self.matcher.matched_item_count
     }

diff --git a/crates/television-channels/src/channels/dirs.rs b/crates/television-channels/src/channels/dirs.rs
@@ -11,6 +11,7 @@ pub struct Channel {
     crawl_handle: tokio::task::JoinHandle<()>,
     // PERF: cache results (to make deleting characters smoother) with
     // a shallow stack of sub-patterns as keys (e.g. "a", "ab", "abc")
+    selected_entries: HashSet<Entry>,
 }
 
 impl Channel {
@@ -21,6 +22,7 @@ impl Channel {
         Channel {
             matcher,
             crawl_handle,
+            selected_entries: HashSet::new(),
         }
     }
 }
@@ -104,6 +106,18 @@ impl OnAir for Channel {
         })
     }
 
+    fn selected_entries(&self) -> &HashSet<Entry> {
+        &self.selected_entries
+    }
+
+    fn toggle_selection(&mut self, entry: &Entry) {
+        if self.selected_entries.contains(entry) {
+            self.selected_entries.remove(entry);
+        } else {
+            self.selected_entries.insert(entry.clone());
+        }
+    }
+
     fn result_count(&self) -> u32 {
         self.matcher.matched_item_count
     }

diff --git a/crates/television-channels/src/channels/env.rs b/crates/television-channels/src/channels/env.rs
@@ -1,3 +1,5 @@
+use std::collections::HashSet;
+
 use devicons::FileIcon;
 
 use super::OnAir;
@@ -15,6 +17,7 @@ struct EnvVar {
 pub struct Channel {
     matcher: Matcher<EnvVar>,
     file_icon: FileIcon,
+    selected_entries: HashSet<Entry>,
 }
 
 const NUM_THREADS: usize = 1;
@@ -32,6 +35,7 @@ impl Channel {
         Channel {
             matcher,
             file_icon: FileIcon::from(FILE_ICON_STR),
+            selected_entries: HashSet::new(),
         }
     }
 }
@@ -95,6 +99,18 @@ impl OnAir for Channel {
         })
     }
 
+    fn selected_entries(&self) -> &HashSet<Entry> {
+        &self.selected_entries
+    }
+
+    fn toggle_selection(&mut self, entry: &Entry) {
+        if self.selected_entries.contains(entry) {
+            self.selected_entries.remove(entry);
+        } else {
+            self.selected_entries.insert(entry.clone());
+        }
+    }
+
     fn result_count(&self) -> u32 {
         self.matcher.matched_item_count
     }

diff --git a/crates/television-channels/src/channels/files.rs b/crates/television-channels/src/channels/files.rs
@@ -11,6 +11,7 @@ pub struct Channel {
     crawl_handle: tokio::task::JoinHandle<()>,
     // PERF: cache results (to make deleting characters smoother) with
     // a shallow stack of sub-patterns as keys (e.g. "a", "ab", "abc")
+    selected_entries: HashSet<Entry>,
 }
 
 impl Channel {
@@ -21,6 +22,7 @@ impl Channel {
         Channel {
             matcher,
             crawl_handle,
+            selected_entries: HashSet::new(),
         }
     }
 }
@@ -106,6 +108,18 @@ impl OnAir for Channel {
         })
     }
 
+    fn selected_entries(&self) -> &HashSet<Entry> {
+        &self.selected_entries
+    }
+
+    fn toggle_selection(&mut self, entry: &Entry) {
+        if self.selected_entries.contains(entry) {
+            self.selected_entries.remove(entry);
+        } else {
+            self.selected_entries.insert(entry.clone());
+        }
+    }
+
     fn result_count(&self) -> u32 {
         self.matcher.matched_item_count
     }

diff --git a/crates/television-channels/src/channels/git_repos.rs b/crates/television-channels/src/channels/git_repos.rs
@@ -2,6 +2,7 @@ use devicons::FileIcon;
 use directories::BaseDirs;
 use ignore::overrides::OverrideBuilder;
 use lazy_static::lazy_static;
+use std::collections::HashSet;
 use std::path::PathBuf;
 use tokio::task::JoinHandle;
 use tracing::debug;
@@ -15,6 +16,7 @@ pub struct Channel {
     matcher: Matcher<String>,
     icon: FileIcon,
     crawl_handle: JoinHandle<()>,
+    selected_entries: HashSet<Entry>,
 }
 
 impl Channel {
@@ -29,6 +31,7 @@ impl Channel {
             matcher,
             icon: FileIcon::from("git"),
             crawl_handle,
+            selected_entries: HashSet::new(),
         }
     }
 }
@@ -81,6 +84,18 @@ impl OnAir for Channel {
         })
     }
 
+    fn selected_entries(&self) -> &HashSet<Entry> {
+        &self.selected_entries
+    }
+
+    fn toggle_selection(&mut self, entry: &Entry) {
+        if self.selected_entries.contains(entry) {
+            self.selected_entries.remove(entry);
+        } else {
+            self.selected_entries.insert(entry.clone());
+        }
+    }
+
     fn result_count(&self) -> u32 {
         self.matcher.matched_item_count
     }

diff --git a/crates/television-channels/src/channels/remote_control.rs b/crates/television-channels/src/channels/remote_control.rs
@@ -1,3 +1,4 @@
+use std::collections::HashSet;
 use std::fmt::Display;
 
 use crate::cable::{CableChannelPrototype, CableChannels};
@@ -13,6 +14,7 @@ use super::cable;
 pub struct RemoteControl {
     matcher: Matcher<RCButton>,
     cable_channels: Option<CableChannels>,
+    selected_entries: HashSet<Entry>,
 }
 
 #[derive(Clone)]
@@ -59,6 +61,7 @@ impl RemoteControl {
         RemoteControl {
             matcher,
             cable_channels,
+            selected_entries: HashSet::new(),
         }
     }
 
@@ -140,6 +143,13 @@ impl OnAir for RemoteControl {
             .collect()
     }
 
+    fn selected_entries(&self) -> &HashSet<Entry> {
+        &self.selected_entries
+    }
+
+    #[allow(unused_variables)]
+    fn toggle_selection(&mut self, entry: &Entry) {}
+
     fn get_result(&self, index: u32) -> Option<Entry> {
         self.matcher.get_result(index).map(|item| {
             let path = item.matched_string;

diff --git a/crates/television-channels/src/channels/stdin.rs b/crates/television-channels/src/channels/stdin.rs
@@ -1,4 +1,5 @@
 use std::{
+    collections::HashSet,
     io::{stdin, BufRead},
     thread::spawn,
 };
@@ -12,6 +13,7 @@ use television_fuzzy::matcher::{config::Config, injector::Injector, Matcher};
 pub struct Channel {
     matcher: Matcher<String>,
     preview_type: PreviewType,
+    selected_entries: HashSet<Entry>,
 }
 
 impl Channel {
@@ -24,6 +26,7 @@ impl Channel {
         Self {
             matcher,
             preview_type: preview_type.unwrap_or_default(),
+            selected_entries: HashSet::new(),
         }
     }
 }
@@ -90,6 +93,18 @@ impl OnAir for Channel {
         })
     }
 
+    fn selected_entries(&self) -> &HashSet<Entry> {
+        &self.selected_entries
+    }
+
+    fn toggle_selection(&mut self, entry: &Entry) {
+        if self.selected_entries.contains(entry) {
+            self.selected_entries.remove(entry);
+        } else {
+            self.selected_entries.insert(entry.clone());
+        }
+    }
+
     fn result_count(&self) -> u32 {
         self.matcher.matched_item_count
     }

diff --git a/crates/television-channels/src/channels/text.rs b/crates/television-channels/src/channels/text.rs
@@ -3,6 +3,7 @@ use crate::entry::{Entry, PreviewType};
 use devicons::FileIcon;
 use ignore::WalkState;
 use std::{
+    collections::HashSet,
     fs::File,
     io::{BufRead, Read, Seek},
     path::{Path, PathBuf},
@@ -36,6 +37,7 @@ impl CandidateLine {
 pub struct Channel {
     matcher: Matcher<CandidateLine>,
     crawl_handle: tokio::task::JoinHandle<()>,
+    selected_entries: HashSet<Entry>,
 }
 
 impl Channel {
@@ -49,6 +51,7 @@ impl Channel {
         Channel {
             matcher,
             crawl_handle,
+            selected_entries: HashSet::new(),
         }
     }
 
@@ -73,6 +76,7 @@ impl Channel {
         Channel {
             matcher,
             crawl_handle,
+            selected_entries: HashSet::new(),
         }
     }
 
@@ -97,6 +101,7 @@ impl Channel {
         Channel {
             matcher,
             crawl_handle: load_handle,
+            selected_entries: HashSet::new(),
         }
     }
 }
@@ -195,6 +200,18 @@ impl OnAir for Channel {
         })
     }
 
+    fn selected_entries(&self) -> &HashSet<Entry> {
+        &self.selected_entries
+    }
+
+    fn toggle_selection(&mut self, entry: &Entry) {
+        if self.selected_entries.contains(entry) {
+            self.selected_entries.remove(entry);
+        } else {
+            self.selected_entries.insert(entry.clone());
+        }
+    }
+
     fn result_count(&self) -> u32 {
         self.matcher.matched_item_count
     }