From ee9af9c9aa3e0a9358f0fc32201a72819317d39b Mon Sep 17 00:00:00 2001
From: Ridan Vandenbergh <ridanvandenbergh@gmail.com>
Date: Wed, 18 Jun 2025 16:38:12 +0200
Subject: [PATCH] `standalone_icon` to quickly find a standalone icon

---
 src/search_dir.rs | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/search_dir.rs b/src/search_dir.rs
index 4c161fd..e03b4ba 100644
--- a/src/search_dir.rs
+++ b/src/search_dir.rs
@@ -112,9 +112,19 @@ impl IconLocations {
 
         ThemeDescriptor::new_from_folders(
             internal_name.to_string_lossy().into_owned(),
-            theme.clone()
+            theme.clone(),
         )
     }
+
+    pub fn standalone_icon<S>(&self, icon_name: S) -> Option<&IconFile>
+    where
+        S: AsRef<OsStr>,
+    {
+        let name = icon_name.as_ref();
+        
+        self.standalone_icons.iter()
+            .find(|icon| icon.path.file_stem() == Some(name))
+    }
 }
 
 /// Anything that turns into an iterator of things that can become paths, can be turned into a `SearchDirectories`.
@@ -158,35 +168,19 @@ impl Default for SearchDirectories {
 #[cfg(test)]
 mod test {
     use crate::search_dir::SearchDirectories;
-    use crate::IconLocations;
 
     // these tests assume certain applications are installed on the system they are ran on.
 
     #[test]
-    fn test_find_htop_icon_outside_icontheme() {
-        let dirs = SearchDirectories::default();
-
-        let IconLocations {
-            standalone_icons,
-            themes_directories,
-        } = dirs.find_icon_locations();
-
-        println!("{:?}", themes_directories);
-
-        assert!(
-            standalone_icons
-                .iter()
-                .any(|i| i.path.file_name().and_then(|s| s.to_str()) == Some("htop.png"))
-        )
-    }
-    
-    #[test]
-    fn test_find_adwaita() {
+    fn test_find_standard_theme_and_icon() {
         let dirs = SearchDirectories::default();
 
         let locations = dirs.find_icon_locations();
+        
         let descriptor = locations.theme("Adwaita").unwrap();
-
         assert_eq!(descriptor.index.name, "Adwaita");
+
+        let icon = locations.standalone_icon("htop").unwrap();
+        assert_eq!(icon.path.file_name(), Some("htop.png".as_ref()))
     }
 }