Merge pull request #119 from Mnem42/path_exclusions

Stuff

Author: Mnem42

Cargo.lock

@@ -5,7 +5,14 @@ edition = "2024"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winreg = "0.52"
-windows = { version = "0.58", features = ["Win32_UI_WindowsAndMessaging", "Win32_Foundation", "Win32_Graphics_Gdi", "Win32_System_Com", "Win32_UI_Shell"] }
+windows = { version = "0.58", features = [
+    "Win32_UI_WindowsAndMessaging", 
+    "Win32_Foundation", 
+    "Win32_Graphics_Gdi", 
+    "Win32_System_Com", 
+    "Win32_UI_Shell",
+    "Win32_Globalization"
+]}
 
 [target.'cfg(target_os = "macos")'.dependencies]
 objc2 = "0.6.3"
@@ -36,6 +43,11 @@ tray-icon = "0.21.3"
 url = "2.5.8"
 tracing = "0.1.44"
 tracing-subscriber = "0.3.22"
+glob = "0.3.3"
+open = "5.3.3"
+regex = "1.12.2"
+lnk = "0.6.3"
+codepage = "0.1.2"
 
 [package.metadata.bundle]
 name = "RustCast"

Cargo.toml

@@ -1,4 +1,5 @@
 //! Main logic for the app
+
 use crate::commands::Function;
 use iced::window::{self, Id, Settings};
 

src/app.rs

@@ -13,8 +13,8 @@ use crate::{
     app::{Message, Page, RUSTCAST_DESC_NAME},
     clipboard::ClipBoardContentType,
     commands::Function,
+    cross_platform::get_img_handle,
     styles::{result_button_style, result_row_container_style},
-    utils::handle_from_icns,
 };
 
 /// This tells each "App" what to do when it is clicked, whether it is a function, a message, or a display
@@ -73,7 +73,7 @@ impl App {
             App {
                 open_command: AppCommand::Function(Function::Quit),
                 desc: RUSTCAST_DESC_NAME.to_string(),
-                icons: handle_from_icns(Path::new(
+                icons: get_img_handle(Path::new(
                     "/Applications/Rustcast.app/Contents/Resources/icon.icns",
                 )),
                 name: "Quit RustCast".to_string(),
@@ -82,7 +82,7 @@ impl App {
             App {
                 open_command: AppCommand::Function(Function::OpenPrefPane),
                 desc: RUSTCAST_DESC_NAME.to_string(),
-                icons: handle_from_icns(Path::new(
+                icons: get_img_handle(Path::new(
                     "/Applications/Rustcast.app/Contents/Resources/icon.icns",
                 )),
                 name: "Open RustCast Preferences".to_string(),
@@ -91,7 +91,7 @@ impl App {
             App {
                 open_command: AppCommand::Message(Message::SwitchToPage(Page::EmojiSearch)),
                 desc: RUSTCAST_DESC_NAME.to_string(),
-                icons: handle_from_icns(Path::new(
+                icons: get_img_handle(Path::new(
                     "/Applications/Rustcast.app/Contents/Resources/icon.icns",
                 )),
                 name: "Search for an Emoji".to_string(),
@@ -100,7 +100,7 @@ impl App {
             App {
                 open_command: AppCommand::Message(Message::SwitchToPage(Page::ClipboardHistory)),
                 desc: RUSTCAST_DESC_NAME.to_string(),
-                icons: handle_from_icns(Path::new(
+                icons: get_img_handle(Path::new(
                     "/Applications/Rustcast.app/Contents/Resources/icon.icns",
                 )),
                 name: "Clipboard History".to_string(),
@@ -109,7 +109,7 @@ impl App {
             App {
                 open_command: AppCommand::Message(Message::ReloadConfig),
                 desc: RUSTCAST_DESC_NAME.to_string(),
-                icons: handle_from_icns(Path::new(
+                icons: get_img_handle(Path::new(
                     "/Applications/Rustcast.app/Contents/Resources/icon.icns",
                 )),
                 name: "Reload RustCast".to_string(),
@@ -118,7 +118,7 @@ impl App {
             App {
                 open_command: AppCommand::Display,
                 desc: RUSTCAST_DESC_NAME.to_string(),
-                icons: handle_from_icns(Path::new(
+                icons: get_img_handle(Path::new(
                     "/Applications/Rustcast.app/Contents/Resources/icon.icns",
                 )),
                 name: format!("Current RustCast Version: {app_version}"),
@@ -129,7 +129,7 @@ impl App {
                     "/System/Library/CoreServices/Finder.app".to_string(),
                 )),
                 desc: "Application".to_string(),
-                icons: handle_from_icns(Path::new(
+                icons: get_img_handle(Path::new(
                     "/System/Library/CoreServices/Finder.app/Contents/Resources/Finder.icns",
                 )),
                 name: "Finder".to_string(),

src/app/apps.rs

@@ -13,14 +13,10 @@ use tray_icon::{
 
 use crate::{
     app::{Message, tile::ExtSender},
-    cross_platform::{open_settings, open_url},
+    cross_platform::open_settings,
 };
 
-const DISCORD_LINK: &str = "https://discord.gg/bDfNYPbnC5";
-
-use tokio::runtime::Runtime;
-
-/// This create a new menubar icon for the app
+/// This creates a new menubar icon for the app
 pub fn menu_icon(hotkey: HotKey, sender: ExtSender) -> TrayIcon {
     let builder = TrayIconBuilder::new();
 
@@ -96,7 +92,9 @@ fn init_event_handler(sender: ExtSender, hotkey_id: u32) {
                     .spawn(async move { sender.clone().try_send(Message::HideTrayIcon).unwrap() });
             }
             "open_issue_page" => {
-                open_url("https://github.com/unsecretised/rustcast/issues/new");
+                if let Err(e) = open::that("https://github.com/unsecretised/rustcast/issues/new") {
+                    tracing::error!("Error opening url: {}", e)
+                }
             }
             "show_rustcast" => {
                 runtime.spawn(async move {
@@ -106,17 +104,20 @@ fn init_event_handler(sender: ExtSender, hotkey_id: u32) {
                         .unwrap();
                 });
             }
-            "open_discord" => {
-                open_url(DISCORD_LINK);
-            }
             "open_help_page" => {
-                open_url("https://github.com/unsecretised/rustcast/discussions/new?category=q-a");
+                if let Err(e) = open::that(
+                    "https://github.com/unsecretised/rustcast/discussions/new?category=q-a",
+                ) {
+                    tracing::error!("Error opening url: {}", e)
+                }
             }
             "open_preferences" => {
                 open_settings();
             }
             "open_github_page" => {
-                open_url("https://github.com/unsecretised/rustcast");
+                if let Err(e) = open::that("https://github.com/unsecretised/rustcast") {
+                    tracing::error!("Error opening url: {}", e)
+                }
             }
             _ => {}
         }

src/app/menubar.rs

@@ -235,19 +235,30 @@ impl Tile {
     }
 
     // Unused, keeping it for now
-    pub fn capture_frontmost(&mut self) {
-        #[cfg(target_os = "macos")]
-        {
-            use objc2_app_kit::NSWorkspace;
+    // pub fn capture_frontmost(&mut self) {
+    //     #[cfg(target_os = "macos")]
+    //     {
+    //         use objc2_app_kit::NSWorkspace;
 
-            let ws = NSWorkspace::sharedWorkspace();
-            self.frontmost = ws.frontmostApplication();
-        };
+    //         let ws = NSWorkspace::sharedWorkspace();
+    //         self.frontmost = ws.frontmostApplication();
+    //     };
 
-        #[cfg(target_os = "windows")]
-        {
-            self.frontmost = Some(unsafe { GetForegroundWindow() });
-        }
+    //     #[cfg(target_os = "windows")]
+    //     {
+    //         use windows::Win32::UI::WindowsAndMessaging::GetForegroundWindow;
+
+    //         self.frontmost = Some(unsafe { GetForegroundWindow() });
+    //     }
+    // }
+
+    /// Gets the frontmost application to focus later.
+    #[cfg(target_os = "macos")]
+    pub fn capture_frontmost(&mut self) {
+        use objc2_app_kit::NSWorkspace;
+
+        let ws = NSWorkspace::sharedWorkspace();
+        self.frontmost = ws.frontmostApplication();
     }
 
     /// Restores the frontmost application.

src/app/tile.rs

@@ -12,11 +12,13 @@ use iced::{Length::Fill, widget::text_input};
 
 use rayon::slice::ParallelSliceMut;
 
+#[cfg(target_os = "windows")]
+use crate::app;
 use crate::app::WINDOW_WIDTH;
 use crate::app::pages::clipboard::clipboard_view;
 use crate::app::pages::emoji::emoji_page;
 use crate::app::tile::AppIndex;
-use crate::utils::get_installed_apps;
+use crate::utils::index_installed_apps;
 use crate::config::Theme;
 use crate::styles::{contents_style, rustcast_text_input_style, tint, with_alpha};
 use crate::{
@@ -67,7 +69,7 @@ pub fn new(hotkey: HotKey, config: &Config) -> (Tile, Task<Message>) {
     let (id, open) = window::open(settings);
 
     #[cfg(target_os = "windows")]
-    let open: Task<iced::window::Id> = open.discard();
+    let open: Task<app::Message> = open.discard();
 
     #[cfg(target_os = "macos")]
     let open = open.discard().chain(window::run(id, |handle| {
@@ -76,7 +78,14 @@ pub fn new(hotkey: HotKey, config: &Config) -> (Tile, Task<Message>) {
         Message::OpenWindow
     }));
 
-    let mut options: Vec<App> = get_installed_apps(config);
+    let options = index_installed_apps(config);
+
+    if let Err(ref e) = options {
+        tracing::error!("Error indexing apps: {e}")
+    }
+
+    // Still try to load the rest
+    let mut options = options.unwrap_or_default();
 
     options.extend(config.shells.iter().map(|x| x.to_app()));
     options.extend(App::basic_apps());

src/app/tile/elm.rs

@@ -25,25 +25,22 @@ use crate::app::menubar::menu_icon;
 use crate::app::tile::AppIndex;
 use crate::app::{Message, Page, tile::Tile};
 
-#[cfg(target_os = "windows")]
-use crate::utils::get_config_installation_dir;
-
 use crate::calculator::Expr;
 use crate::clipboard::ClipBoardContentType;
 use crate::commands::Function;
 use crate::config::Config;
 use crate::unit_conversion;
-use crate::utils::get_installed_apps;
+use crate::utils::index_installed_apps;
 
-use crate::utils::is_valid_url;
 #[cfg(target_os = "macos")]
 use crate::{
     cross_platform::macos::focus_this_app,
     cross_platform::macos::haptics::{HapticPattern, perform_haptic},
 };
 
 pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
-    tracing::debug!("Handling update (message: {:?})", message);
+    tracing::trace!("Handling update (message: {:?})", message);
+
     match message {
         Message::OpenWindow => {
             #[cfg(target_os = "macos")]
@@ -189,20 +186,20 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                 Ok(a) => a,
                 Err(_) => return Task::none(),
             };
+            let mut options = Vec::new();
 
-            let mut new_options: Vec<App> = default_app_paths()
-                .par_iter()
-                .map(|path| get_installed_apps(path, new_config.theme.show_icons))
-                .flatten()
-                .collect();
+            match index_installed_apps(&new_config) {
+                Ok(x)  => options.extend(x),
+                Err(e) => tracing::error!("Error indexing apps: {e}")
+            }
 
-            new_options.extend(new_config.shells.iter().map(|x| x.to_app()));
-            new_options.extend(App::basic_apps());
-            new_options.par_sort_by_key(|x| x.name.len());
+            options.extend(new_config.shells.iter().map(|x| x.to_app()));
+            options.extend(App::basic_apps());
+            options.par_sort_by_key(|x| x.name.len());
 
             tile.theme = new_config.theme.to_owned().into();
             tile.config = new_config;
-            tile.options = AppIndex::from_apps(new_options);
+            tile.options = AppIndex::from_apps(options);
             Task::none()
         }
 
@@ -310,6 +307,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
             tile.results = vec![];
             Task::none()
         }
+
         Message::WindowFocusChanged(wid, focused) => {
             tile.focused = focused;
             if !focused {
@@ -332,7 +330,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
             }
 
             tile.query_lc = input.trim().to_lowercase();
-            tile.query = input;
+            tile.query = input.clone();
             let prev_size = tile.results.len();
             if tile.query_lc.is_empty() && tile.page != Page::ClipboardHistory {
                 tile.results = vec![];
@@ -430,7 +428,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                         }
                     })
                     .collect();
-            } else if tile.results.is_empty() && is_valid_url(&tile.query) {
+            } else if tile.results.is_empty() && url::Url::parse(&input).is_ok() {
                 tile.results.push(App {
                     open_command: AppCommand::Function(Function::OpenWebsite(tile.query.clone())),
                     desc: "Web Browsing".to_string(),

src/app/tile/update.rs

@@ -75,23 +75,15 @@ impl Function {
                 );
             }
 
-            #[cfg(target_os = "macos")]
             Function::OpenWebsite(url) => {
                 let open_url = if url.starts_with("http") {
                     url.to_owned()
                 } else {
                     format!("https://{}", url)
                 };
 
-                thread::spawn(move || {
-                    NSWorkspace::new().openURL(
-                        &NSURL::URLWithString_relativeToURL(
-                            &objc2_foundation::NSString::from_str(&open_url),
-                            None,
-                        )
-                        .unwrap(),
-                    );
-                });
+                // Should never get here without it being validated first
+                open::that(open_url).unwrap();
             }
 
             Function::Calculate(expr) => {
@@ -110,8 +102,8 @@ impl Function {
                 }
             },
 
+            #[cfg(target_os = "macos")]
             Function::OpenPrefPane => {
-                #[cfg(target_os = "macos")]
                 thread::spawn(move || {
                     NSWorkspace::new().openURL(&NSURL::fileURLWithPath(
                         &objc2_foundation::NSString::from_str(
@@ -123,6 +115,10 @@ impl Function {
             }
 
             Function::Quit => std::process::exit(0),
+            f => {
+                // TODO: something in the UI to show this
+                tracing::error!("The function {:?} is unimplemented for this platform", f);
+            }
         }
     }
 }