Merge pull request #259 from JakeStanger/fix/images

Image fixes

src/desktop_file.rs

@@ -95,7 +95,7 @@ fn find_desktop_file_by_filename(app_id: &str, files: &[PathBuf]) -> Option<Path
                 // `com.company.app` or `com.app.something`
                 app_id
                     .split(&[' ', ':', '@', '.', '_'][..])
-                    .any(|part| name.contains(part))
+                    .any(|part| name.eq_ignore_ascii_case(part))
             })
         })
         .map(|(file, _)| file.into())

src/image/gtk.rs

@@ -12,7 +12,7 @@ pub fn new_icon_button(input: &str, icon_theme: &IconTheme, size: i32) -> Button
         image.add_class("image");
         image.add_class("icon");
 
-        match ImageProvider::parse(input, icon_theme, size)
+        match ImageProvider::parse(input, icon_theme, false, size)
             .map(|provider| provider.load_into_image(image.clone()))
         {
             Some(_) => {
@@ -41,7 +41,7 @@ pub fn new_icon_label(input: &str, icon_theme: &IconTheme, size: i32) -> gtk::Bo
 
         container.add(&image);
 
-        ImageProvider::parse(input, icon_theme, size)
+        ImageProvider::parse(input, icon_theme, false, size)
             .map(|provider| provider.load_into_image(image));
     } else {
         let label = Label::new(Some(input));

src/image/provider.rs

@@ -41,30 +41,44 @@ impl<'a> ImageProvider<'a> {
     ///
     /// Note this checks that icons exist in theme, or files exist on disk
     /// but no other check is performed.
-    pub fn parse(input: &str, theme: &'a IconTheme, size: i32) -> Option<Self> {
-        let location = Self::get_location(input, theme, size, 0)?;
+    pub fn parse(input: &str, theme: &'a IconTheme, use_fallback: bool, size: i32) -> Option<Self> {
+        let location = Self::get_location(input, theme, size, use_fallback, 0)?;
+
         Some(Self { location, size })
     }
 
     /// Returns true if the input starts with a prefix
     /// that is supported by the parser
     /// (ie the parser would not fallback to checking the input).
-    #[cfg(any(feature = "music", feature = "workspaces"))]
     pub fn is_definitely_image_input(input: &str) -> bool {
         input.starts_with("icon:")
             || input.starts_with("file://")
             || input.starts_with("http://")
             || input.starts_with("https://")
+            || input.starts_with('/')
     }
 
     fn get_location(
         input: &str,
         theme: &'a IconTheme,
         size: i32,
+        use_fallback: bool,
         recurse_depth: usize,
     ) -> Option<ImageLocation<'a>> {
+        macro_rules! fallback {
+            () => {
+                if use_fallback {
+                    Some(Self::get_fallback_icon(theme))
+                } else {
+                    None
+                }
+            };
+        }
+
         const MAX_RECURSE_DEPTH: usize = 2;
 
+        let should_parse_desktop_file = !Self::is_definitely_image_input(input);
+
         let (input_type, input_name) = input
             .split_once(':')
             .map_or((None, input), |(t, n)| (Some(t), n));
@@ -99,22 +113,26 @@ impl<'a> ImageProvider<'a> {
                     Report::msg(format!("Unsupported image type: {input_type}"))
                         .note("You may need to recompile with support if available")
                 );
-                None
+                fallback!()
             }
             None if PathBuf::from(input_name).is_file() => {
                 Some(ImageLocation::Local(PathBuf::from(input_name)))
             }
-            None if recurse_depth == MAX_RECURSE_DEPTH => Some(Self::get_fallback_icon(theme)),
-            None => {
-                if let Some(location) = get_desktop_icon_name(input_name)
-                    .map(|input| Self::get_location(&input, theme, size, recurse_depth + 1))
-                {
+            None if recurse_depth == MAX_RECURSE_DEPTH => fallback!(),
+            None if should_parse_desktop_file => {
+                if let Some(location) = get_desktop_icon_name(input_name).map(|input| {
+                    Self::get_location(&input, theme, size, use_fallback, recurse_depth + 1)
+                }) {
                     location
                 } else {
                     warn!("Failed to find image: {input}");
-                    Some(Self::get_fallback_icon(theme))
+                    fallback!()
                 }
             }
+            None => {
+                warn!("Failed to find image: {input}");
+                fallback!()
+            }
         }
     }
 

src/modules/custom/image.rs

@@ -32,7 +32,7 @@ impl CustomWidget for ImageWidget {
             let icon_theme = context.icon_theme.clone();
 
             dynamic_string(&self.src, move |src| {
-                ImageProvider::parse(&src, &icon_theme, self.size)
+                ImageProvider::parse(&src, &icon_theme, false, self.size)
                     .map(|image| image.load_into_image(gtk_image.clone()));
 
                 Continue(true)

src/modules/focused.rs

@@ -128,7 +128,7 @@ impl Module<gtk::Box> for FocusedModule {
             let icon_theme = icon_theme.clone();
             context.widget_rx.attach(None, move |(name, id)| {
                 if self.show_icon {
-                    match ImageProvider::parse(&id, &icon_theme, self.icon_size)
+                    match ImageProvider::parse(&id, &icon_theme, true, self.icon_size)
                         .map(|image| image.load_into_image(icon.clone()))
                     {
                         Some(Ok(_)) => icon.show(),

src/modules/launcher/item.rs

@@ -191,7 +191,7 @@ impl ItemButton {
         if appearance.show_icons {
             let gtk_image = gtk::Image::new();
             let image =
-                ImageProvider::parse(&item.app_id.clone(), icon_theme, appearance.icon_size);
+                ImageProvider::parse(&item.app_id.clone(), icon_theme, true, appearance.icon_size);
             if let Some(image) = image {
                 button.set_image(Some(&gtk_image));
                 button.set_always_show_image(true);

src/modules/music/mod.rs

@@ -408,11 +408,13 @@ impl Module<Button> for MusicModule {
                         if prev_cover != new_cover {
                             prev_cover = new_cover.clone();
                             let res = if let Some(image) = new_cover.and_then(|cover_path| {
-                                ImageProvider::parse(&cover_path, &icon_theme, image_size)
+                                ImageProvider::parse(&cover_path, &icon_theme, false, image_size)
                             }) {
+                                album_image.show();
                                 image.load_into_image(album_image.clone())
                             } else {
                                 album_image.set_from_pixbuf(None);
+                                album_image.hide();
                                 Ok(())
                             };
 

src/modules/upower.rs

@@ -189,7 +189,7 @@ impl Module<gtk::Button> for UpowerModule {
             .attach(None, move |properties: UpowerProperties| {
                 let format = format.replace("{percentage}", &properties.percentage.to_string());
                 let icon_name = String::from("icon:") + &properties.icon_name;
-                ImageProvider::parse(&icon_name, &icon_theme, self.icon_size)
+                ImageProvider::parse(&icon_name, &icon_theme, false, self.icon_size)
                     .map(|provider| provider.load_into_image(icon.clone()));
                 label.set_markup(format.as_ref());
                 Continue(true)