From 66fdf397cb3e7aa63bf7eab153c3d4991afd4be9 Mon Sep 17 00:00:00 2001
From: Michael Aaron Murphy <mmstick@pm.me>
Date: Wed, 18 Aug 2021 14:38:20 +0200
Subject: [PATCH] fix(desktop-entries): Hide entry if it doesn't match DE
 requirement

---
 plugins/src/desktop_entries/mod.rs | 34 ++++++++++++++++++------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/plugins/src/desktop_entries/mod.rs b/plugins/src/desktop_entries/mod.rs
index a24aba9..8742270 100644
--- a/plugins/src/desktop_entries/mod.rs
+++ b/plugins/src/desktop_entries/mod.rs
@@ -97,23 +97,29 @@ impl<W: AsyncWrite + Unpin> App<W> {
         for (src, path) in DesktopIter::new(default_paths()) {
             if let Ok(bytes) = std::fs::read_to_string(&path) {
                 if let Ok(entry) = DesktopEntry::decode(&path, &bytes) {
-                    if entry.no_display() {
-                        let matched = current
-                            .as_ref()
-                            .zip(entry.only_show_in())
-                            .map(|(current, desktops)| {
-                                !desktops
-                                    .to_ascii_lowercase()
-                                    .split(';')
-                                    .any(|desktop| current.iter().any(|c| *c == desktop))
-                            })
-                            .unwrap_or(true);
+                    // If defined to only show in a specific DE, avoid showing it if invalid.
+                    let mut desktop_matched = false;
+                    if let Some(desktops) = entry.only_show_in() {
+                        desktop_matched = match current.as_ref() {
+                            Some(current) => desktops
+                                .to_ascii_lowercase()
+                                .split(';')
+                                .any(|desktop| current.iter().any(|c| *c == desktop)),
+                            None => false,
+                        };
 
-                        if matched || entry.name(None).map_or(false, |v| v == "GNOME Shell") {
+                        if !desktop_matched {
                             continue;
                         }
                     }
 
+                    if entry.no_display()
+                        && (!desktop_matched
+                            || entry.name(None).map_or(false, |v| v == "GNOME Shell"))
+                    {
+                        continue;
+                    }
+
                     if let Some((name, exec)) = entry.name(locale).zip(entry.exec()) {
                         if let Some(exec) = exec.split_ascii_whitespace().next() {
                             let item = Item {
@@ -218,7 +224,9 @@ impl<W: AsyncWrite + Unpin> App<W> {
             for search_interest in items.drain(..) {
                 let search_interest = search_interest.to_ascii_lowercase();
                 let append = search_interest.starts_with(&*query)
-                    || query.split_ascii_whitespace().any(|query| search_interest.contains(&*query))
+                    || query
+                        .split_ascii_whitespace()
+                        .any(|query| search_interest.contains(&*query))
                     || strsim::damerau_levenshtein(&*query, &*search_interest) < 3;
 
                 if append {