Use systemicons fork for mime icons

Cargo.toml

@@ -16,7 +16,6 @@ rfd = { version = "0.12.0", optional = true }
 serde = { version = "1", features = ["serde_derive"] }
 syntect = "5.1.0"
 two-face = "0.3.0"
-xdg-mime = "0.3.3"
 # Internationalization
 i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] }
 i18n-embed-fl = "0.6.4"
@@ -33,6 +32,10 @@ default-features = false
 features = ["winit", "wgpu"]
 #path = "../libcosmic"
 
+#TODO: clean up and send changes upstream
+[dependencies.systemicons]
+git = "https://github.com/jackpot51/systemicons"
+
 [features]
 default = ["rfd"]
 

src/mime_icon.rs

@@ -1,28 +1,53 @@
 use cosmic::widget::icon;
-use std::path::Path;
+use std::{collections::HashMap, path::Path, sync::Mutex};
 
 pub const FALLBACK_MIME_ICON: &str = "text-x-generic";
 
+#[derive(Debug, Eq, Hash, PartialEq)]
+struct MimeIconKey {
+    path: String,
+    size: u16,
+}
+
+struct MimeIconCache {
+    cache: HashMap<MimeIconKey, Option<icon::Handle>>,
+}
+
+impl MimeIconCache {
+    pub fn new() -> Self {
+        Self {
+            cache: HashMap::new(),
+        }
+    }
+
+    pub fn get(&mut self, key: MimeIconKey) -> Option<icon::Handle> {
+        self.cache
+            .entry(key)
+            .or_insert_with_key(|key| match systemicons::get_icon(&key.path, key.size) {
+                Ok(ok) => Some(icon::from_raster_bytes(ok)),
+                Err(err) => {
+                    log::warn!("failed to get icon for {:?}: {:?}", key, err);
+                    None
+                }
+            })
+            .clone()
+    }
+}
+
 lazy_static::lazy_static! {
-    static ref SHARED_MIME_INFO: xdg_mime::SharedMimeInfo = xdg_mime::SharedMimeInfo::new();
+    static ref MIME_ICON_CACHE: Mutex<MimeIconCache> = Mutex::new(MimeIconCache::new());
 }
 
 pub fn mime_icon<P: AsRef<Path>>(path: P, size: u16) -> icon::Icon {
-    let path = path.as_ref();
+    //TODO: smarter path handling
-    //TODO: SHARED_MIME_INFO.get_mime_types_from_file_name(path)
+    let path = path
-    for mime_type in mime_guess::from_path(path) {
+        .as_ref()
-        for icon_name in SHARED_MIME_INFO.lookup_icon_names(&mime_type) {
+        .to_str()
-            let named = icon::from_name(icon_name).size(size);
+        .expect("failed to convert path to UTF-8")
-            if named.clone().path().is_some() {
+        .to_owned();
-                return named.icon();
+    let mut mime_icon_cache = MIME_ICON_CACHE.lock().unwrap();
-            }
+    match mime_icon_cache.get(MimeIconKey { path, size }) {
-        }
+        Some(handle) => icon::icon(handle).size(size),
-
+        None => icon::from_name(FALLBACK_MIME_ICON).size(size).icon(),
-        let icon_name = mime_type.essence_str().replace("/", "-");
-        let named = icon::from_name(icon_name).size(size);
-        if named.clone().path().is_some() {
-            return named.icon();
-        }
     }
-    icon::from_name(FALLBACK_MIME_ICON).size(size).icon()
 }