Add modes that run shell scripts

Author: unsecretised

src/app.rs

@@ -1,4 +1,7 @@
 //! Main logic for the app
+use std::collections::HashMap;
+
+use crate::app::apps::App;
 use crate::commands::Function;
 use crate::{app::tile::ExtSender, clipboard::ClipBoardContentType};
 
@@ -59,6 +62,7 @@ pub enum Message {
     WindowFocusChanged(Id, bool),
     ClearSearchQuery,
     HideTrayIcon,
+    SwitchMode(String),
     ReloadConfig,
     SetSender(ExtSender),
     SwitchToPage(Page),
@@ -82,3 +86,26 @@ pub fn default_settings() -> Settings {
         ..Default::default()
     }
 }
+
+pub trait ToApp {
+    fn to_app(&self) -> App;
+}
+
+pub trait ToApps {
+    fn to_apps(&self) -> Vec<App>;
+}
+
+impl ToApps for HashMap<String, String> {
+    fn to_apps(&self) -> Vec<App> {
+        self.keys()
+            .map(|key| App {
+                ranking: 0,
+                open_command: apps::AppCommand::Message(Message::SwitchMode(key.trim().to_owned())),
+                search_name: key.to_owned(),
+                desc: "Switch Modes".to_string(),
+                icons: None,
+                display_name: format!("Switch mode to: {}", key.trim()),
+            })
+            .collect()
+    }
+}

src/app/tile.rs

@@ -102,6 +102,7 @@ pub struct Tile {
     pub theme: iced::Theme,
     pub focus_id: u32,
     pub query: String,
+    pub current_mode: String,
     query_lc: String,
     results: Vec<App>,
     options: AppIndex,
@@ -354,7 +355,7 @@ fn handle_clipboard_history() -> impl futures::Stream<Item = Message> {
                     .ok();
                 prev_byte_rep = byte_rep;
             }
-            tokio::time::sleep(Duration::from_millis(10)).await;
+            tokio::time::sleep(Duration::from_millis(100)).await;
         }
     })
 }

src/app/tile/elm.rs

@@ -13,9 +13,9 @@ use iced::{Length::Fill, widget::text_input};
 use log::info;
 use rayon::slice::ParallelSliceMut;
 
-use crate::app::DEFAULT_WINDOW_HEIGHT;
 use crate::app::pages::emoji::emoji_page;
 use crate::app::tile::{AppIndex, Hotkeys};
+use crate::app::{DEFAULT_WINDOW_HEIGHT, ToApp, ToApps};
 use crate::config::Theme;
 use crate::styles::{contents_style, glass_border, glass_surface, rustcast_text_input_style};
 use crate::{app::WINDOW_WIDTH, platform};
@@ -44,6 +44,9 @@ pub fn new(hotkey: HotKey, config: &Config) -> (Tile, Task<Message>) {
     options.extend(config.shells.iter().map(|x| x.to_app()));
     info!("Loaded shell commands");
 
+    options.extend(config.modes.to_apps());
+    info!("Loaded modes");
+
     options.extend(App::basic_apps());
     info!("Loaded basic apps / default apps");
     options.par_sort_by_key(|x| x.display_name.len());
@@ -59,6 +62,7 @@ pub fn new(hotkey: HotKey, config: &Config) -> (Tile, Task<Message>) {
 
     (
         Tile {
+            current_mode: "".to_string(),
             query: String::new(),
             query_lc: String::new(),
             focus_id: 0,
@@ -70,7 +74,7 @@ pub fn new(hotkey: HotKey, config: &Config) -> (Tile, Task<Message>) {
             frontmost: None,
             focused: false,
             config: config.clone(),
-            theme: config.theme.to_owned().into(),
+            theme: config.theme.to_owned().clone().into(),
             clipboard_content: vec![],
             tray_icon: None,
             sender: None,

src/app/tile/update.rs

@@ -13,6 +13,7 @@ use iced::window::Id;
 use log::info;
 use rayon::slice::ParallelSliceMut;
 
+use crate::app::ToApp;
 use crate::app::WINDOW_WIDTH;
 use crate::app::apps::App;
 use crate::app::apps::AppCommand;
@@ -40,6 +41,20 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
             tile.visible = true;
             Task::none()
         }
+
+        Message::SwitchMode(mode) => {
+            if let Some(command) = tile.config.modes.get(mode.trim()) {
+                tile.current_mode = mode.clone();
+                info!("switched mode");
+                Task::done(Message::RunFunction(Function::RunShellCommand(
+                    command.to_owned(),
+                )))
+            } else {
+                info!("no presentation found");
+                Task::none()
+            }
+        }
+
         Message::HideTrayIcon => {
             tile.tray_icon = None;
             tile.config.show_trayicon = false;
@@ -275,7 +290,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
         }
 
         Message::RunFunction(command) => {
-            command.execute(&tile.config, &tile.query);
+            command.execute(&tile.config);
 
             let return_focus_task = match &command {
                 Function::OpenApp(_) | Function::OpenPrefPane | Function::GoogleSearch(_) => {

src/commands.rs

@@ -12,7 +12,7 @@ use crate::{calculator::Expr, clipboard::ClipBoardContentType, config::Config};
 #[derive(Debug, Clone, PartialEq)]
 pub enum Function {
     OpenApp(String),
-    RunShellCommand(String, String),
+    RunShellCommand(String),
     OpenWebsite(String),
     RandomVar(i32), // Easter egg function
     CopyToClipboard(ClipBoardContentType),
@@ -24,7 +24,7 @@ pub enum Function {
 
 impl Function {
     /// Run the command
-    pub fn execute(&self, config: &Config, query: &str) {
+    pub fn execute(&self, config: &Config) {
         match self {
             Function::OpenApp(path) => {
                 let path = path.to_owned();
@@ -34,13 +34,10 @@ impl Function {
                     ));
                 });
             }
-            Function::RunShellCommand(command, alias) => {
-                let query = query.to_string();
-                let final_command =
-                    format!(r#"{} {}"#, command, query.strip_prefix(alias).unwrap_or(""));
+            Function::RunShellCommand(command) => {
                 Command::new("sh")
                     .arg("-c")
-                    .arg(final_command.trim())
+                    .arg(format!("\"{}\"", command))
                     .spawn()
                     .ok();
             }

src/config.rs

@@ -1,11 +1,14 @@
 //! This is the config file type definitions for rustcast
-use std::{path::Path, sync::Arc};
+use std::{collections::HashMap, path::Path, sync::Arc};
 
 use iced::{Font, font::Family, theme::Custom, widget::image::Handle};
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    app::apps::{App, AppCommand},
+    app::{
+        ToApp,
+        apps::{App, AppCommand},
+    },
     commands::Function,
     utils::handle_from_icns,
 };
@@ -23,6 +26,7 @@ pub struct Config {
     pub haptic_feedback: bool,
     pub show_trayicon: bool,
     pub shells: Vec<Shelly>,
+    pub modes: HashMap<String, String>,
     pub log_path: String,
 }
 
@@ -39,6 +43,7 @@ impl Default for Config {
             haptic_feedback: false,
             show_trayicon: true,
             log_path: "/tmp/rustcast.log".to_string(),
+            modes: HashMap::new(),
             shells: vec![],
         }
     }
@@ -173,9 +178,8 @@ pub struct Shelly {
     alias_lc: String,
 }
 
-impl Shelly {
-    /// Converts the shelly struct to an app so that it can be added to the app list
-    pub fn to_app(&self) -> App {
+impl ToApp for Shelly {
+    fn to_app(&self) -> App {
         let self_clone = self.clone();
         let icon = self_clone.icon_path.and_then(|x| {
             let x = x.replace("~", &std::env::var("HOME").unwrap());
@@ -187,10 +191,7 @@ impl Shelly {
         });
         App {
             ranking: 0,
-            open_command: AppCommand::Function(Function::RunShellCommand(
-                self_clone.command,
-                self_clone.alias_lc.clone(),
-            )),
+            open_command: AppCommand::Function(Function::RunShellCommand(self_clone.command)),
             desc: "Shell Command".to_string(),
             icons: icon,
             display_name: self_clone.alias,

src/main.rs

@@ -1,3 +1,5 @@
+#![deny(clippy::dbg_macro)]
+
 mod app;
 mod calculator;
 mod clipboard;