Merge pull request #267 from RustCastLabs/events-opening

feat: add events opening

Author: unsecretised

Cargo.lock

@@ -23,7 +23,8 @@ objc2 = "0.6.3"
 objc2-app-kit = { version = "0.3.2", features = ["NSImage"] }
 objc2-application-services = { version = "0.3.2", default-features = false, features = ["HIServices", "Processes"] }
 objc2-core-foundation = "0.3.2"
-objc2-foundation = { version = "0.3.2", features = ["NSString"] }
+objc2-event-kit = "0.3.2"
+objc2-foundation = { version = "0.3.2", features = ["NSDateFormatter", "NSFormatter", "NSString"] }
 objc2-service-management = "0.3.2"
 once_cell = "1.21.3"
 rand = "0.9.2"

Cargo.toml

@@ -101,6 +101,7 @@ pub enum Message {
     OpenFileDialogue(String),
     ReturnFocus,
     EscKeyPressed(Id),
+    UpdateEvents,
     ClearSearchResults,
     WindowFocusChanged(Id, bool),
     ClearSearchQuery,
@@ -131,6 +132,7 @@ pub enum SetConfigFields {
     HapticFeedback(bool),
     ShowMenubarIcon(bool),
     SetPage(MainPage),
+    SetEventDuration(String),
     Modes(Editable<(String, String)>),
     Aliases(Editable<(String, String)>),
     SearchDirs(Editable<String>),

src/app.rs

@@ -59,6 +59,16 @@ impl PartialEq for App {
 }
 
 impl App {
+    pub fn new(name: String, icon: Option<Handle>, desc: String, command: AppCommand) -> Self {
+        Self {
+            ranking: 0,
+            open_command: command,
+            icons: icon,
+            search_name: name.to_lowercase(),
+            display_name: name,
+            desc,
+        }
+    }
     /// A vec of all the emojis as App structs
     pub fn emoji_apps() -> Vec<App> {
         emojis::iter()

src/app/apps.rs

@@ -175,7 +175,7 @@ pub fn settings_page(config: Config) -> Element<'static, Message> {
             })
             .into(),
             radio(
-                "Frequently Used",
+                "Frequents",
                 MainPage::FrequentlyUsed,
                 Some(config.main_page),
                 |page| Message::SetConfig(SetConfigFields::SetPage(page)),
@@ -185,6 +185,14 @@ pub fn settings_page(config: Config) -> Element<'static, Message> {
                 move |_, _| settings_radio_button_style(&theme_clone.clone())
             })
             .into(),
+            radio("Events", MainPage::Events, Some(config.main_page), |page| {
+                Message::SetConfig(SetConfigFields::SetPage(page))
+            })
+            .style({
+                let theme_clone = theme_clone.clone();
+                move |_, _| settings_radio_button_style(&theme_clone.clone())
+            })
+            .into(),
             radio("Nothing", MainPage::Blank, Some(config.main_page), |page| {
                 Message::SetConfig(SetConfigFields::SetPage(page))
             })
@@ -277,6 +285,23 @@ pub fn settings_page(config: Config) -> Element<'static, Message> {
         notice_item(theme.clone(), "What font rustcast should use"),
     ]);
 
+    let theme_clone = theme.clone();
+    let event_duration = settings_item_column([
+        settings_hint_text(theme.clone(), "Set Event duration"),
+        text_input("Event duration", &config.event_duration.to_string())
+            .on_input(move |input: String| {
+                Message::SetConfig(SetConfigFields::SetEventDuration(input))
+            })
+            .on_submit(Message::WriteConfig(false))
+            .width(Length::Fill)
+            .style(move |_, _| settings_text_input_item_style(&theme_clone))
+            .into(),
+        notice_item(
+            theme.clone(),
+            "How many minutes from now the events should be displayed",
+        ),
+    ]);
+
     let theme_clone = theme.clone();
     let theme_clone_1 = theme.clone();
     let theme_clone_2 = theme.clone();
@@ -431,6 +456,7 @@ pub fn settings_page(config: Config) -> Element<'static, Message> {
         clear_on_enter.into(),
         show_icons.into(),
         font_family.into(),
+        event_duration.into(),
         text_clr.into(),
         bg_clr.into(),
         settings_hint_text(theme.clone(), "Aliases"),

src/app/pages/settings.rs

@@ -8,6 +8,7 @@ use crate::clipboard::ClipBoardContentType;
 use crate::config::{Config, Shelly};
 use crate::debounce::Debouncer;
 use crate::platform::default_app_paths;
+use crate::platform::macos::events::Event;
 use crate::platform::macos::launching::Shortcut;
 
 use arboard::Clipboard;
@@ -173,6 +174,7 @@ pub struct Tile {
     emoji_apps: AppIndex,
     visible: bool,
     focused: bool,
+    pub events: Vec<Event>,
     frontmost: Option<Retained<NSRunningApplication>>,
     pub config: Config,
     hotkeys: Hotkeys,
@@ -233,6 +235,7 @@ impl Tile {
             keyboard,
             Subscription::run(crate::platform::macos::urlscheme::url_stream),
             Subscription::run(handle_recipient),
+            Subscription::run(reload_events),
             Subscription::run(handle_version_and_rankings),
             Subscription::run(handle_clipboard_history),
             Subscription::run(handle_file_search),
@@ -595,6 +598,15 @@ fn handle_recipient() -> impl futures::Stream<Item = Message> {
     })
 }
 
+fn reload_events() -> impl futures::Stream<Item = Message> {
+    stream::channel(100, async |mut output| {
+        loop {
+            output.send(Message::UpdateEvents).await.ok();
+            tokio::time::sleep(Duration::from_mins(2)).await;
+        }
+    })
+}
+
 fn handle_version_and_rankings() -> impl futures::Stream<Item = Message> {
     stream::channel(100, async |mut output| {
         let current_version = format!("\"{}\"", option_env!("APP_VERSION").unwrap_or(""));

src/app/tile.rs

@@ -22,6 +22,7 @@ use crate::app::tile::{AppIndex, Hotkeys};
 use crate::app::{DEFAULT_WINDOW_HEIGHT, ToApp, ToApps};
 use crate::config::Theme;
 use crate::debounce::Debouncer;
+use crate::platform::macos::events::Event;
 use crate::styles::{
     contents_style, glass_border, glass_surface, results_scrollbar_style, rustcast_text_input_style,
 };
@@ -38,6 +39,8 @@ pub fn new(hotkeys: Hotkeys, config: &Config) -> (Tile, Task<Message>) {
     let (id, open) = window::open(default_settings());
     info!("Opening window");
 
+    let events = Event::get_events(config.event_duration);
+
     let open = open.discard().chain(window::run(id, |handle| {
         platform::window_config(&handle.window_handle().expect("Unable to get window handle"));
         transform_process_to_ui_element();
@@ -78,6 +81,7 @@ pub fn new(hotkeys: Hotkeys, config: &Config) -> (Tile, Task<Message>) {
             results: vec![],
             options,
             hotkeys,
+            events,
             emoji_apps: AppIndex::from_apps(App::emoji_apps()),
             visible: true,
             frontmost: None,

src/app/tile/elm.rs

@@ -36,6 +36,7 @@ use crate::commands::Function;
 use crate::config::Config;
 use crate::config::MainPage;
 use crate::debounce::DebouncePolicy;
+use crate::platform::macos::events::Event;
 use crate::platform::macos::launching::Shortcut;
 use crate::platform::macos::launching::global_handler;
 use crate::platform::macos::{start_at_login, stop_at_login};
@@ -71,6 +72,11 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
             }
         }
 
+        Message::UpdateEvents => {
+            tile.events = Event::get_events(tile.config.event_duration);
+            Task::none()
+        }
+
         Message::UriReceived(uri) => {
             let Ok(url) = Url::parse(&uri) else {
                 return Task::none();
@@ -706,6 +712,15 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                 SetConfigFields::Modes(Editable::Create((key, value))) => {
                     final_config.modes.insert(key, value);
                 }
+                SetConfigFields::SetEventDuration(duration) => {
+                    if duration.trim().is_empty() {
+                        final_config.event_duration = 0;
+                    } else if let Ok(duration) = duration.parse::<u32>() {
+                        final_config.event_duration = duration;
+                    }
+
+                    tile.events = Event::get_events(final_config.event_duration);
+                }
                 SetConfigFields::Modes(Editable::Delete((key, _))) => {
                     final_config.modes.remove(&key);
                 }
@@ -976,6 +991,7 @@ fn execute_query(tile: &mut Tile, id: Id) -> Task<Message> {
     if tile.page == Page::Main && tile.query_lc.is_empty() {
         tile.results = match tile.config.main_page {
             MainPage::FrequentlyUsed => tile.frequent_results(),
+            MainPage::Events => tile.events.iter().map(|x| x.to_app()).collect(),
             MainPage::Blank => vec![],
             MainPage::Favourites => tile.options.get_favourites(),
         };

src/app/tile/update.rs

@@ -19,6 +19,7 @@ use crate::{
 pub enum Function {
     OpenApp(String),
     QuitApp(String),
+    OpenRawUrl(String),
     QuitAllApps,
     RunShellCommand(String),
     OpenWebsite(String),
@@ -41,6 +42,19 @@ impl Function {
                     ));
                 });
             }
+
+            Function::OpenRawUrl(url) => {
+                let url = url.to_owned();
+                thread::spawn(move || {
+                    NSWorkspace::new().openURL(
+                        &NSURL::URLWithString_relativeToURL(
+                            &objc2_foundation::NSString::from_str(&url),
+                            None,
+                        )
+                        .unwrap(),
+                    );
+                });
+            }
             Function::RunShellCommand(command) => {
                 Command::new("sh").arg("-c").arg(command).spawn().ok();
             }

src/commands.rs

@@ -20,6 +20,7 @@ pub struct Config {
     pub toggle_hotkey: String,
     pub clipboard_hotkey: String,
     pub buffer_rules: Buffer,
+    pub event_duration: u32,
     pub main_page: MainPage,
     pub start_at_login: bool,
     pub theme: Theme,
@@ -45,6 +46,7 @@ impl Default for Config {
             buffer_rules: Buffer::default(),
             theme: Theme::default(),
             start_at_login: true,
+            event_duration: 60,
             placeholder: String::from("Time to be productive!"),
             search_url: "https://duckduckgo.com/search?q=%s".to_string(),
             cbhist: true,
@@ -66,16 +68,18 @@ impl Default for Config {
 pub enum MainPage {
     Favourites,
     FrequentlyUsed,
+    Events,
     #[default]
     Blank,
 }
 
 impl std::fmt::Display for MainPage {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str(match self {
-            MainPage::Blank => "♥️ Rustcast",
+            MainPage::Blank => "Rustcast",
             MainPage::Favourites => "Favourites",
             MainPage::FrequentlyUsed => "Frequently Used",
+            MainPage::Events => "Events",
         })
     }
 }