leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: dialog uses parsed mime to match the type

Browse source 
It used to try to match images/* to the image/png and fail. Now it
matches the type if the subtype is STAR.
This commit is contained in:
Hojjat 2026-02-23 11:37:29 -07:00
parent ee719d578c
commit 5b65c7f456
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/dialog.rs
View file

@ -24,6 +24,7 @@ use cosmic::{
segmented_button, segmented_button,
}, },
}; };
use mime_guess::{Mime, mime};
use notify_debouncer_full::{ use notify_debouncer_full::{
DebouncedEvent, Debouncer, RecommendedCache, new_debouncer, DebouncedEvent, Debouncer, RecommendedCache, new_debouncer,
notify::{self, RecommendedWatcher}, notify::{self, RecommendedWatcher},
@ -1871,7 +1872,6 @@ impl Application for App {
if let Some(filter_i) = self.filter_selected if let Some(filter_i) = self.filter_selected
&& let Some(filter) = self.filters.get(filter_i) && let Some(filter) = self.filters.get(filter_i)
{ {
// Parse globs (Mime implements PartialEq with &str, so no need to parse)
let mut parsed_globs = Vec::new(); let mut parsed_globs = Vec::new();
let mut mimes = Vec::new(); let mut mimes = Vec::new();
for pattern in &filter.patterns { for pattern in &filter.patterns {
@ -1884,15 +1884,25 @@ impl Application for App {
} }
} }
} }
DialogFilterPattern::Mime(value) => mimes.push(value.as_str()), DialogFilterPattern::Mime(value) => match value.parse::<Mime>() {
Ok(parsed) => mimes.push(parsed),
Err(err) => {
log::warn!("failed to parse mime {value:?}: {err}");
}
},
} }
} }
items.retain(|item| { items.retain(|item| {
// Directories are always shown // Directories are always shown
item.metadata.is_dir() item.metadata.is_dir()
// Check for mime type match (first because it is faster) || mimes.iter().any(|filter_mime| {
|| mimes.iter().copied().any(|mime| mime == item.mime) if filter_mime.subtype() == mime::STAR {
filter_mime.type_() == item.mime.type_()
} else {
*filter_mime == item.mime
}
})
// Check for glob match (last because it is slower) // Check for glob match (last because it is slower)
|| parsed_globs.iter().any(|glob| glob.matches(&item.name)) || parsed_globs.iter().any(|glob| glob.matches(&item.name))
}); });