Use relative paths instead of absolute paths for icons

Author: unsecretised

docs/icon.icns

@@ -1,7 +1,6 @@
 //! This modules handles the logic for each "app" that rustcast can load
 //!
 //! An "app" is effectively, one of the results that rustcast returns when you search for something
-use std::path::Path;
 
 use iced::{
     Alignment,
@@ -14,9 +13,11 @@ use crate::{
     clipboard::ClipBoardContentType,
     commands::Function,
     styles::{result_button_style, result_row_container_style},
-    utils::handle_from_icns,
+    utils::icns_data_to_handle,
 };
 
+pub const ICNS_ICON: &[u8] = include_bytes!("../../docs/icon.icns");
+
 /// This tells each "App" what to do when it is clicked, whether it is a function, a message, or a display
 #[allow(dead_code)]
 #[derive(Debug, Clone)]
@@ -69,58 +70,48 @@ impl App {
     pub fn basic_apps() -> Vec<App> {
         let app_version = option_env!("APP_VERSION").unwrap_or("Unknown Version");
 
+        let icons = icns_data_to_handle(ICNS_ICON.to_vec());
+
         vec![
             App {
                 open_command: AppCommand::Function(Function::Quit),
                 desc: RUSTCAST_DESC_NAME.to_string(),
-                icons: handle_from_icns(Path::new(
-                    "/Applications/Rustcast.app/Contents/Resources/icon.icns",
-                )),
+                icons: icons.clone(),
                 name: "Quit RustCast".to_string(),
                 name_lc: "quit".to_string(),
             },
             App {
                 open_command: AppCommand::Function(Function::OpenPrefPane),
                 desc: RUSTCAST_DESC_NAME.to_string(),
-                icons: handle_from_icns(Path::new(
-                    "/Applications/Rustcast.app/Contents/Resources/icon.icns",
-                )),
+                icons: icons.clone(),
                 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",
-                )),
+                icons: icons.clone(),
                 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(),
-                icons: handle_from_icns(Path::new(
-                    "/Applications/Rustcast.app/Contents/Resources/icon.icns",
-                )),
+                icons: icons.clone(),
                 name: "Clipboard History".to_string(),
                 name_lc: "clipboard".to_string(),
             },
             App {
                 open_command: AppCommand::Message(Message::ReloadConfig),
                 desc: RUSTCAST_DESC_NAME.to_string(),
-                icons: handle_from_icns(Path::new(
-                    "/Applications/Rustcast.app/Contents/Resources/icon.icns",
-                )),
+                icons: icons.clone(),
                 name: "Reload RustCast".to_string(),
                 name_lc: "refresh".to_string(),
             },
             App {
                 open_command: AppCommand::Display,
                 desc: RUSTCAST_DESC_NAME.to_string(),
-                icons: handle_from_icns(Path::new(
-                    "/Applications/Rustcast.app/Contents/Resources/icon.icns",
-                )),
+                icons: icons.clone(),
                 name: format!("Current RustCast Version: {app_version}"),
                 name_lc: "version".to_string(),
             },

docs/lemon.png

@@ -1,5 +1,7 @@
 //! This has the menubar icon logic for the app
 
+use std::io::Cursor;
+
 use global_hotkey::hotkey::{Code, HotKey, Modifiers};
 use image::{DynamicImage, ImageReader};
 use tray_icon::{
@@ -54,13 +56,11 @@ pub fn menu_icon(hotkey: HotKey, sender: ExtSender) -> TrayIcon {
 }
 
 fn get_image() -> DynamicImage {
-    let image_path = if cfg!(debug_assertions) {
-        "docs/icon.png"
-    } else {
-        "/Applications/Rustcast.app/Contents/Resources/icon.png"
-    };
-
-    ImageReader::open(image_path).unwrap().decode().unwrap()
+    ImageReader::new(Cursor::new(include_bytes!("../../docs/icon.png")))
+        .with_guessed_format()
+        .unwrap()
+        .decode()
+        .unwrap()
 }
 
 fn init_event_handler(sender: ExtSender, hotkey_id: u32) {

src/app/apps.rs

@@ -1,7 +1,7 @@
 //! This handles the update logic for the tile (AKA rustcast's main window)
 use std::cmp::min;
 use std::fs;
-use std::path::Path;
+use std::io::Cursor;
 use std::thread;
 
 use iced::Task;
@@ -436,9 +436,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                 tile.results.push(App {
                     open_command: AppCommand::Display,
                     desc: "Easter Egg".to_string(),
-                    icons: Some(Handle::from_path(Path::new(
-                        "/Applications/Rustcast.app/Contents/Resources/lemon.png",
-                    ))),
+                    icons: lemon_icon_handle(),
                     name: "Lemon".to_string(),
                     name_lc: "".to_string(),
                 });
@@ -490,3 +488,12 @@ fn open_window(height: f32) -> Task<Message> {
 fn single_item_resize_task(id: Id) -> Task<Message> {
     Task::done(Message::ResizeWindow(id, 55. + DEFAULT_WINDOW_HEIGHT))
 }
+
+fn lemon_icon_handle() -> Option<Handle> {
+    image::ImageReader::new(Cursor::new(include_bytes!("../../../docs/lemon.png")))
+        .with_guessed_format()
+        .unwrap()
+        .decode()
+        .ok()
+        .map(|img| Handle::from_rgba(img.width(), img.height(), img.into_bytes()))
+}

src/app/menubar.rs

@@ -25,17 +25,15 @@ pub(crate) fn log_error_and_exit(msg: &str) -> ! {
     exit(-1)
 }
 
-/// This converts an icns file to an iced image handle
-pub(crate) fn handle_from_icns(path: &Path) -> Option<Handle> {
-    let data = std::fs::read(path).ok()?;
+pub fn icns_data_to_handle(data: Vec<u8>) -> Option<Handle> {
     let family = IconFamily::read(std::io::Cursor::new(&data)).ok()?;
 
     let icon_type = family.available_icons();
 
     let icon = family.get_icon_with_type(*icon_type.first()?).ok()?;
     let image = RgbaImage::from_raw(
-        icon.width() as u32,
-        icon.height() as u32,
+        icon.width(),
+        icon.height(),
         icon.data().to_vec(),
     )?;
     Some(Handle::from_rgba(
@@ -45,6 +43,12 @@ pub(crate) fn handle_from_icns(path: &Path) -> Option<Handle> {
     ))
 }
 
+/// This converts an icns file to an iced image handle
+pub(crate) fn handle_from_icns(path: &Path) -> Option<Handle> {
+    let data = std::fs::read(path).ok()?;
+    icns_data_to_handle(data)
+}
+
 /// Open the settings file with the system default editor
 pub fn open_settings() {
     thread::spawn(move || {