Added desktop entry to overriding criteria

Made overriding dependent on both the icon and the name being identical,
this should prevent desktop entries from being mistakenly overridden.
This commit is contained in:
Kirottu
2023-05-15 14:04:55 +03:00
parent de606380a2
commit 063d5b91b4

View File

@@ -179,7 +179,11 @@ pub fn scrubber(config: &Config) -> Result<Vec<(DesktopEntry, u64)>, Box<dyn std
Err(_why) => return None,
};
let entries = DesktopEntry::from_dir_entry(&entry, config);
Some(entries.into_iter().map(|entry| (entry.name.clone(), entry)))
Some(
entries
.into_iter()
.map(|entry| (format!("{}{}", entry.name, entry.icon), entry)),
)
})
.flatten()
.collect();
@@ -195,7 +199,11 @@ pub fn scrubber(config: &Config) -> Result<Vec<(DesktopEntry, u64)>, Box<dyn std
Err(_why) => return None,
};
let entries = DesktopEntry::from_dir_entry(&entry, config);
Some(entries.into_iter().map(|entry| (entry.name.clone(), entry)))
Some(
entries
.into_iter()
.map(|entry| (format!("{}{}", entry.name, entry.icon), entry)),
)
})
.flatten(),
),