dan/icon
1
0
Fork 0
mirror of https://github.com/danbulant/icon synced 2026-07-06 03:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix an issue wherein standalone icons that are symlinked do not correctly get found

Browse source
This commit is contained in:
Ridan Vandenbergh 2025-06-24 18:03:19 +02:00
parent c83e670c35
commit 6fbf0662fb
No known key found for this signature in database
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/search.rs
View file

@ -139,14 +139,14 @@ impl IconSearch<Initial> {
fn find_icon_locations(&self) -> IconLocations { fn find_icon_locations(&self) -> IconLocations {
// "Each theme is stored as subdirectories of the base directories" // "Each theme is stored as subdirectories of the base directories"
let (files, dirs) = self let (dirs, files) = self
.dirs .dirs
.iter() .iter()
.flat_map(|base_dir| base_dir.read_dir()) // read the entries in each base dir .flat_map(|base_dir| base_dir.read_dir()) // read the entries in each base dir
.flatten() // merge all the iterators .flatten() // merge all the iterators
.flatten() // remove Err entries .flatten() // remove Err entries
.filter_map(|entry| Some((entry.file_type().ok()?, entry))) // get file type for each entry and skip if fail .filter_map(|entry| Some((entry.file_type().ok()?, entry))) // get file type for each entry and skip if fail
.partition::<Vec<_>, _>(|(ft, _)| ft.is_file()); .partition::<Vec<_>, _>(|(ft, _)| ft.is_dir());
// icons at the top-level in a base_dir don't belong to a theme, but must still be able to be found! // icons at the top-level in a base_dir don't belong to a theme, but must still be able to be found!
let files = files let files = files
@ -564,4 +564,5 @@ mod test {
let icon = locations.standalone_icon("htop").unwrap(); let icon = locations.standalone_icon("htop").unwrap();
assert_eq!(icon.path.file_name(), Some("htop.png".as_ref())) assert_eq!(icon.path.file_name(), Some("htop.png".as_ref()))
} }
} }