leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: add only_show_in filter for loaded apps

Browse source
This commit is contained in:
Ashley Wulber 2025-04-29 13:53:16 -04:00 • committed by Ashley Wulber
parent 6763abec41
commit 76c7100ef4
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/desktop.rs
View file

@ -53,10 +53,18 @@ pub struct DesktopEntryData {
pub fn load_applications<'a>( pub fn load_applications<'a>(
locales: &'a [String], locales: &'a [String],
include_no_display: bool, include_no_display: bool,
only_show_in: Option<&'a str>,
) -> impl Iterator<Item = DesktopEntryData> + 'a { ) -> impl Iterator<Item = DesktopEntryData> + 'a {
fde::Iter::new(fde::default_paths()) fde::Iter::new(fde::default_paths())
.filter_map(move |p| fde::DesktopEntry::from_path(p, Some(locales)).ok()) .filter_map(move |p| fde::DesktopEntry::from_path(p, Some(locales)).ok())
.filter(move |de| include_no_display || !de.no_display()) .filter(move |de| {
(include_no_display || !de.no_display())
&& !only_show_in.zip(de.only_show_in()).is_some_and(
|(xdg_current_desktop, only_show_in)| {
!only_show_in.contains(&xdg_current_desktop)
},
)
})
.map(move |de| DesktopEntryData::from_desktop_entry(locales, de)) .map(move |de| DesktopEntryData::from_desktop_entry(locales, de))
} }
@ -69,6 +77,7 @@ pub fn load_applications_for_app_ids<'a>(
app_ids: Vec<&'a str>, app_ids: Vec<&'a str>,
fill_missing_ones: bool, fill_missing_ones: bool,
include_no_display: bool, include_no_display: bool,
only_show_in: Option<&'a str>,
) -> impl Iterator<Item = DesktopEntryData> + 'a { ) -> impl Iterator<Item = DesktopEntryData> + 'a {
let app_ids = std::rc::Rc::new(std::cell::RefCell::new(app_ids)); let app_ids = std::rc::Rc::new(std::cell::RefCell::new(app_ids));
let app_ids_ = app_ids.clone(); let app_ids_ = app_ids.clone();
@ -78,6 +87,11 @@ pub fn load_applications_for_app_ids<'a>(
if !include_no_display && de.no_display() { if !include_no_display && de.no_display() {
return false; return false;
} }
if only_show_in.zip(de.only_show_in()).is_some_and(
|(xdg_current_desktop, only_show_in)| !only_show_in.contains(&xdg_current_desktop),
) {
return false;
}
// Search by ID first // Search by ID first
app_ids app_ids