Merge branch 'master' into quitting-apps

Author: unsecretised

docs/config.toml

@@ -66,4 +66,3 @@ command = "echo "
 # icon_path is optional
 alias = "Variables 1" # the name that will be displayed in the results
 alias_lc = "var test" # the name used to search for it
-

src/app.rs

@@ -83,6 +83,7 @@ pub enum Message {
     UpdateAvailable,
     ResizeWindow(Id, f32),
     OpenWindow,
+    OpenResult(u32),
     OpenToSettings,
     SearchQueryChanged(String, Id),
     KeyPressed(u32),

src/app/apps.rs

@@ -173,6 +173,7 @@ impl App {
         theme: crate::config::Theme,
         id_num: u32,
         focussed_id: u32,
+        on_press: Option<Message>,
     ) -> iced::Element<'static, Message> {
         let focused = focussed_id == id_num;
 
@@ -210,11 +211,11 @@ impl App {
         }
         row = row.push(container(text_block).width(Fill));
 
-        let msg = match self.open_command.clone() {
+        let msg = on_press.or(match self.open_command.clone() {
             AppCommand::Function(func) => Some(Message::RunFunction(func)),
             AppCommand::Message(msg) => Some(msg),
             AppCommand::Display => None,
-        };
+        });
 
         let theme_clone = theme.clone();
 

src/app/pages/clipboard.rs

@@ -60,7 +60,7 @@ pub fn clipboard_view(
                 Column::from_iter(clipboard_content.iter().enumerate().map(|(i, content)| {
                     content
                         .to_app()
-                        .render(theme.clone(), i as u32, focussed_id)
+                        .render(theme.clone(), i as u32, focussed_id, None)
                 }))
                 .width(WINDOW_WIDTH / 3.),
                 Direction::Vertical(Scrollbar::hidden()),

src/app/tile.rs

@@ -27,6 +27,7 @@ use log::{info, warn};
 use objc2::rc::Retained;
 use objc2_app_kit::NSRunningApplication;
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
+use rayon::slice::ParallelSliceMut;
 use tokio::io::AsyncBufReadExt;
 use tray_icon::TrayIcon;
 
@@ -71,6 +72,24 @@ impl AppIndex {
         app.ranking += 1;
     }
 
+    fn top_ranked(&self, limit: usize) -> Vec<App> {
+        let mut ranked: Vec<App> = self
+            .by_name
+            .values()
+            .filter(|app| app.ranking > 0)
+            .cloned()
+            .collect();
+
+        ranked.par_sort_by(|left, right| {
+            right
+                .ranking
+                .cmp(&left.ranking)
+                .then_with(|| left.display_name.cmp(&right.display_name))
+        });
+        ranked.truncate(limit);
+        ranked
+    }
+
     fn empty() -> AppIndex {
         AppIndex {
             by_name: HashMap::new(),
@@ -261,6 +280,10 @@ impl Tile {
         self.results = results;
     }
 
+    pub fn frequent_results(&self) -> Vec<App> {
+        self.options.top_ranked(5)
+    }
+
     /// Gets the frontmost application to focus later.
     pub fn capture_frontmost(&mut self) {
         use objc2_app_kit::NSWorkspace;

src/app/tile/elm.rs

@@ -136,8 +136,12 @@ pub fn view(tile: &Tile, wid: window::Id) -> Element<'_, Message> {
             Page::Settings => settings_page(tile.config.clone()),
             Page::FileSearch | Page::Main => container(Column::from_iter(
                 tile.results.iter().enumerate().map(|(i, app)| {
-                    app.clone()
-                        .render(tile.config.theme.clone(), i as u32, tile.focus_id)
+                    app.clone().render(
+                        tile.config.theme.clone(),
+                        i as u32,
+                        tile.focus_id,
+                        Some(Message::OpenResult(i as u32)),
+                    )
                 }),
             ))
             .into(),
@@ -164,7 +168,11 @@ pub fn view(tile: &Tile, wid: window::Id) -> Element<'_, Message> {
             .height(height as u32);
 
         let text = if tile.query_lc.is_empty() {
-            tile.page.to_string()
+            if tile.page == Page::Main {
+                "Frequently used".to_string()
+            } else {
+                tile.page.to_string()
+            }
         } else {
             match results_count {
                 1 => "1 result found".to_string(),

src/app/tile/update.rs

@@ -49,7 +49,14 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
             focus_this_app();
             tile.focused = true;
             tile.visible = true;
-            Task::none()
+
+            if tile.page == Page::Main && tile.query_lc.is_empty() {
+                window::latest()
+                    .map(|x| x.unwrap())
+                    .map(|id| Message::SearchQueryChanged(String::new(), id))
+            } else {
+                Task::none()
+            }
         }
 
         Message::UpdateAvailable => {
@@ -222,42 +229,8 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
             )
         }
 
-        Message::OpenFocused => {
-            info!("Open Focussed called");
-            let results = if tile.page == Page::ClipboardHistory {
-                tile.clipboard_content
-                    .iter()
-                    .map(|x| x.to_app().to_owned())
-                    .collect()
-            } else {
-                tile.results.clone()
-            };
-            match results.get(tile.focus_id as usize) {
-                Some(App {
-                    search_name: name,
-                    open_command: AppCommand::Function(func),
-                    ..
-                }) => {
-                    info!("Updating ranking for: {name}");
-                    tile.options.update_ranking(name);
-                    Task::done(Message::RunFunction(func.to_owned()))
-                }
-                Some(App {
-                    search_name: name,
-                    open_command: AppCommand::Message(msg),
-                    ..
-                }) => {
-                    info!("Updating ranking for: {name}");
-                    tile.options.update_ranking(name);
-                    Task::done(msg.to_owned())
-                }
-                Some(App {
-                    open_command: AppCommand::Display,
-                    ..
-                }) => Task::done(Message::ReturnFocus),
-                None => Task::none(),
-            }
-        }
+        Message::OpenFocused => Task::done(Message::OpenResult(tile.focus_id)),
+        Message::OpenResult(id) => open_result(tile, id as usize),
 
         Message::ReloadConfig => {
             info!("Reloading config");
@@ -356,10 +329,19 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                 _ => Task::none(),
             };
 
+            let refresh_empty_main_query = if tile.page == Page::Main {
+                window::latest()
+                    .map(|x| x.unwrap())
+                    .map(|id| Message::SearchQueryChanged(String::new(), id))
+            } else {
+                Task::none()
+            };
+
             Task::batch([
                 Task::done(Message::ClearSearchQuery),
                 Task::done(Message::ClearSearchResults),
                 task,
+                refresh_empty_main_query,
             ])
         }
 
@@ -575,7 +557,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
             let mut final_config = tile.config.clone();
             match config {
                 SetConfigFields::ToggleHotkey(hk) => final_config.toggle_hotkey = hk,
-                SetConfigFields::ClipboardHotkey(hk) => final_config.toggle_hotkey = hk,
+                SetConfigFields::ClipboardHotkey(hk) => final_config.clipboard_hotkey = hk,
                 SetConfigFields::Modes(Editable::Create((key, value))) => {
                     final_config.modes.insert(key, value);
                 }
@@ -732,6 +714,52 @@ fn resize_task(id: Id, count: u32) -> Task<Message> {
     ))
 }
 
+fn resize_for_results_count(id: Id, count: usize) -> Task<Message> {
+    if count == 0 {
+        return zero_item_resize_task(id);
+    }
+    if count == 1 {
+        return single_item_resize_task(id);
+    }
+
+    let max_elem = min(5, count);
+    Task::done(Message::ResizeWindow(
+        id,
+        ((max_elem * 55) + 35 + DEFAULT_WINDOW_HEIGHT as usize) as f32,
+    ))
+}
+
+fn open_result(tile: &mut Tile, id: usize) -> Task<Message> {
+    let results = if tile.page == Page::ClipboardHistory {
+        tile.clipboard_content
+            .iter()
+            .map(|x| x.to_app().to_owned())
+            .collect()
+    } else {
+        tile.results.clone()
+    };
+
+    let Some(app) = results.get(id).cloned() else {
+        return Task::none();
+    };
+
+    let search_name = app.search_name.clone();
+
+    match app.open_command {
+        AppCommand::Function(func) => {
+            info!("Updating ranking for: {search_name}");
+            tile.options.update_ranking(&search_name);
+            Task::done(Message::RunFunction(func))
+        }
+        AppCommand::Message(msg) => {
+            info!("Updating ranking for: {search_name}");
+            tile.options.update_ranking(&search_name);
+            Task::done(msg)
+        }
+        AppCommand::Display => Task::done(Message::ReturnFocus),
+    }
+}
+
 /// Handling the lemon easter egg icon
 fn lemon_icon_handle() -> Option<Handle> {
     image::ImageReader::new(Cursor::new(include_bytes!("../../../docs/lemon.png")))
@@ -755,6 +783,11 @@ fn execute_query(tile: &mut Tile, id: Id) -> Task<Message> {
         _ => {}
     }
 
+    if tile.page == Page::Main && tile.query_lc.is_empty() {
+        tile.results = tile.frequent_results();
+        return resize_for_results_count(id, tile.results.len());
+    }
+
     if tile.query_lc.is_empty()
         || (tile.query_lc.chars().count() < 2 && tile.page == Page::FileSearch)
     {