Merge pull request #109 from unsecretised/emoji-searching

Add emoji searching to rustcast

Author: unsecretised

Cargo.lock

@@ -6,6 +6,7 @@ edition = "2024"
 [dependencies]
 anyhow = "1.0.100"
 arboard = "3.6.1"
+emojis = "0.8.0"
 global-hotkey = "0.7.0"
 iced = { version = "0.14.0", features = ["image", "tokio"] }
 icns = "0.3.1"

Cargo.toml

@@ -21,6 +21,7 @@ pub const RUSTCAST_DESC_NAME: &str = "RustCast";
 pub enum Page {
     Main,
     ClipboardHistory,
+    EmojiSearch,
 }
 
 /// The types of arrow keys

src/app.rs

@@ -11,6 +11,7 @@ use iced::{
 
 use crate::{
     app::{Message, Page, RUSTCAST_DESC_NAME},
+    clipboard::ClipBoardContentType,
     commands::Function,
     styles::{result_button_style, result_row_container_style},
     utils::handle_from_icns,
@@ -49,6 +50,21 @@ impl PartialEq for App {
 }
 
 impl App {
+    /// A vec of all the emojis as App structs
+    pub fn emoji_apps() -> Vec<App> {
+        emojis::iter()
+            .filter(|x| x.unicode_version() < emojis::UnicodeVersion::new(13, 0))
+            .map(|x| App {
+                icons: None,
+                name: x.to_string(),
+                name_lc: x.name().to_string(),
+                open_command: AppCommand::Function(Function::CopyToClipboard(
+                    ClipBoardContentType::Text(x.to_string()),
+                )),
+                desc: x.name().to_string(),
+            })
+            .collect()
+    }
     /// This returns the basic apps that rustcast has, such as quiting rustcast and opening preferences
     pub fn basic_apps() -> Vec<App> {
         let app_version = option_env!("APP_VERSION").unwrap_or("Unknown Version");
@@ -72,6 +88,15 @@ impl App {
                 name: "Open RustCast Preferences".to_string(),
                 name_lc: "settings".to_string(),
             },
+            App {
+                open_command: AppCommand::Message(Message::SwitchToPage(Page::EmojiSearch)),
+                desc: RUSTCAST_DESC_NAME.to_string(),
+                icons: handle_from_icns(Path::new(
+                    "/Applications/Rustcast.app/Contents/Resources/icon.icns",
+                )),
+                name: "Search for an Emoji".to_string(),
+                name_lc: "emoji".to_string(),
+            },
             App {
                 open_command: AppCommand::Message(Message::SwitchToPage(Page::ClipboardHistory)),
                 desc: RUSTCAST_DESC_NAME.to_string(),

src/app/apps.rs

@@ -29,6 +29,7 @@ use tray_icon::TrayIcon;
 
 use std::collections::BTreeMap;
 use std::fs;
+use std::ops::Bound;
 use std::path::PathBuf;
 use std::time::Duration;
 
@@ -51,7 +52,7 @@ impl AppIndex {
     /// Search for an element in the index that starts with the provided prefix
     fn search_prefix<'a>(&'a self, prefix: &'a str) -> impl Iterator<Item = &'a App> + 'a {
         self.by_name
-            .range(prefix.to_string()..) // start at prefix
+            .range::<str, _>((Bound::Included(prefix), Bound::Unbounded))
             .take_while(move |(k, _)| k.starts_with(prefix))
             .map(|(_, v)| v)
     }
@@ -90,6 +91,7 @@ pub struct Tile {
     query_lc: String,
     results: Vec<App>,
     options: AppIndex,
+    emoji_apps: AppIndex,
     visible: bool,
     focused: bool,
     frontmost: Option<Retained<NSRunningApplication>>,
@@ -207,8 +209,14 @@ impl Tile {
     /// function to handle the search query changed event.
     pub fn handle_search_query_changed(&mut self) {
         let query = self.query_lc.clone();
-        let results: Vec<App> = self
-            .options
+        let options = if self.page == Page::Main {
+            &self.options
+        } else if self.page == Page::EmojiSearch {
+            &self.emoji_apps
+        } else {
+            &AppIndex::from_apps(vec![])
+        };
+        let results: Vec<App> = options
             .search_prefix(&query)
             .map(|x| x.to_owned())
             .collect();

src/app/tile.rs

@@ -68,6 +68,7 @@ pub fn new(hotkey: HotKey, config: &Config) -> (Tile, Task<Message>) {
             focus_id: 0,
             results: vec![],
             options,
+            emoji_apps: AppIndex::from_apps(App::emoji_apps()),
             hotkey,
             visible: true,
             frontmost: None,

src/app/tile/elm.rs

@@ -3,7 +3,6 @@ use std::cmp::min;
 use std::fs;
 use std::path::Path;
 use std::thread;
-use std::time::Duration;
 
 use iced::Task;
 use iced::widget::image::Handle;
@@ -98,7 +97,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
             tile.query_lc = input.trim().to_lowercase();
             tile.query = input;
             let prev_size = tile.results.len();
-            if tile.query_lc.is_empty() && tile.page == Page::Main {
+            if tile.query_lc.is_empty() && tile.page != Page::ClipboardHistory {
                 tile.results = vec![];
                 return window::resize(
                     id,
@@ -240,9 +239,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                 tile.page = Page::ClipboardHistory
             }
 
-            if prev_size != new_length && tile.page == Page::Main {
-                std::thread::sleep(Duration::from_millis(30));
-
+            if prev_size != new_length && tile.page != Page::ClipboardHistory {
                 Task::batch([
                     window::resize(
                         id,
@@ -367,7 +364,10 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
 
         Message::SwitchToPage(page) => {
             tile.page = page;
-            Task::none()
+            Task::batch([
+                Task::done(Message::ClearSearchQuery),
+                Task::done(Message::ClearSearchResults),
+            ])
         }
 
         Message::RunFunction(command) => {