From 6a424bf901d522996555298e87a1b5fc1898c8c1 Mon Sep 17 00:00:00 2001
From: Christian Friedow <christian@friedow.com>
Date: Sun, 31 Mar 2024 16:21:58 +0200
Subject: [PATCH 1/9] =?UTF-8?q?=F0=9F=90=9B=20filter=20hidden=20entries,?=
 =?UTF-8?q?=20entries=20with=20type=20!=3D=20application=20and=20fix=20onl?=
 =?UTF-8?q?yshowin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/plugin/applications.rs | 33 +++++++++++++++++++------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/client/src/plugin/applications.rs b/client/src/plugin/applications.rs
index e9d2f18..13de89c 100644
--- a/client/src/plugin/applications.rs
+++ b/client/src/plugin/applications.rs
@@ -58,6 +58,25 @@ fn read_desktop_entry(path: &std::path::PathBuf) -> anyhow::Result<crate::model:
 }
 
 fn is_visible(desktop_entry: &freedesktop_desktop_entry::DesktopEntry) -> bool {
+    if desktop_entry.type_() != Some("Application") {
+        return false;
+    }
+
+    if desktop_entry.desktop_entry("Hidden") == Some("true") {
+        return false;
+    }
+
+    if desktop_entry.no_display() {
+        return false;
+    }
+
+    // filter entries where Exec == false
+    if let Some(exec) = desktop_entry.exec() {
+        if exec.to_ascii_lowercase() == "false" {
+            return false;
+        }
+    }
+
     let desktop = std::env::var("XDG_CURRENT_DESKTOP").unwrap_or(String::from("sway"));
     // filter entries where NotShowIn == current desktop
     if let Some(not_show_in) = desktop_entry.desktop_entry("NotShowIn") {
@@ -72,19 +91,7 @@ fn is_visible(desktop_entry: &freedesktop_desktop_entry::DesktopEntry) -> bool {
     if let Some(only_show_in) = desktop_entry.only_show_in() {
         let only_show_in_desktops = only_show_in.to_ascii_lowercase();
 
-        if !only_show_in_desktops.split(';').any(|d| d == desktop) {
-            return false;
-        }
-    }
-
-    // filter entries where NoDisplay != true
-    if desktop_entry.no_display() {
-        return false;
-    }
-
-    // filter entries where Exec == false
-    if let Some(exec) = desktop_entry.exec() {
-        if exec.to_ascii_lowercase() == "false" {
+        if !only_show_in_desktops.split(';').all(|d| d != desktop) {
             return false;
         }
     }

From 0817218375d3fe6d16a9c62caf06ccbefd9e347b Mon Sep 17 00:00:00 2001
From: Christian Friedow <christian@friedow.com>
Date: Mon, 1 Apr 2024 14:05:06 +0200
Subject: [PATCH 2/9] =?UTF-8?q?=F0=9F=90=9B=20fix=20terminal=20application?=
 =?UTF-8?q?=20launching?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/plugin/applications.rs | 97 ++++++++++++++++++++-----------
 1 file changed, 64 insertions(+), 33 deletions(-)

diff --git a/client/src/plugin/applications.rs b/client/src/plugin/applications.rs
index 13de89c..f656d46 100644
--- a/client/src/plugin/applications.rs
+++ b/client/src/plugin/applications.rs
@@ -5,33 +5,34 @@ pub struct ApplicationsPlugin {
     entries: Vec<crate::model::Entry>,
 }
 
-fn read_desktop_entry(path: &std::path::PathBuf) -> anyhow::Result<crate::model::Entry> {
-    let pathstr = path.to_str().unwrap_or("");
-    let bytes = std::fs::read_to_string(path)?;
-    let desktop_entry = freedesktop_desktop_entry::DesktopEntry::decode(path, &bytes)?;
+fn read_desktop_entry(
+    path: &std::path::PathBuf,
+    terminal_command: Option<String>,
+) -> Option<crate::model::Entry> {
+    let bytes_result = std::fs::read_to_string(path);
+    if let Err(reading_error) = bytes_result {
+        log::warn!(target: "applications", "Desktop entry at path '{:?}' will be hidden because reading it failed: {}", path, reading_error);
+        return None;
+    }
+    let bytes = bytes_result.unwrap();
+
+    let desktop_entry_result = freedesktop_desktop_entry::DesktopEntry::decode(path, &bytes);
+    if let Err(parsing_error) = desktop_entry_result {
+        log::warn!(target: "applications", "Desktop entry at path '{:?}' will be hidden because parsing it failed: {}", path, parsing_error);
+        return None;
+    }
+    let desktop_entry = desktop_entry_result.unwrap();
 
     if !is_visible(&desktop_entry) {
-        return Err(anyhow::anyhow!(
-            "Desktop entry at path '{}' is hidden.",
-            pathstr
-        ));
+        log::info!(target: "applications", "Desktop entry at path '{:?}' will be hidden because of its properties.", path);
+        return None;
     }
 
     let locale = std::env::var("LANG").unwrap_or(String::from("en_US"));
-    let title = desktop_entry
-        .name(Some(&locale))
-        .context(format!(
-            "Desktop entry at path '{}' is missing the 'name' field.",
-            pathstr
-        ))?
-        .to_string();
-
-    let cmd = desktop_entry
-        .exec()
-        .context(format!(
-            "Desktop entry at path '{}' is missing the 'exec' field.",
-            pathstr
-        ))?
+    let title = desktop_entry.name(Some(&locale))?.to_string();
+
+    let mut cmd: Vec<String> = desktop_entry
+        .exec()?
         .split_ascii_whitespace()
         .filter_map(|s| {
             if s.starts_with('%') {
@@ -42,13 +43,23 @@ fn read_desktop_entry(path: &std::path::PathBuf) -> anyhow::Result<crate::model:
         })
         .collect();
 
+    if desktop_entry.terminal() {
+        if terminal_command.is_none() {
+            log::warn!(target: "applications", "Desktop entry with name '{}' will be hidden because no terminal emulator was found to launch it with.", title);
+            return None;
+        }
+
+        cmd.insert(0, terminal_command.unwrap());
+        cmd.insert(1, "-e".into());
+    }
+
     let mut meta = desktop_entry
         .keywords()
         .unwrap_or(std::borrow::Cow::from(""))
         .replace(';', " ");
     meta.push_str(" Applications Apps");
 
-    Ok(crate::model::Entry {
+    Some(crate::model::Entry {
         id: desktop_entry.appid.to_string(),
         title,
         action: String::from("open"),
@@ -99,6 +110,25 @@ fn is_visible(desktop_entry: &freedesktop_desktop_entry::DesktopEntry) -> bool {
     true
 }
 
+fn terminal_command(path: &std::path::PathBuf) -> Option<String> {
+    let bytes = std::fs::read_to_string(path).ok()?;
+    let desktop_entry = freedesktop_desktop_entry::DesktopEntry::decode(path, &bytes).ok()?;
+
+    if desktop_entry
+        .categories()?
+        .split(";")
+        .any(|category| category == "TerminalEmulator")
+    {
+        let terminal_cmd: Option<&str> = desktop_entry.exec()?.split_ascii_whitespace().nth(0);
+
+        return match terminal_cmd {
+            Some(cmd) => Some(String::from(cmd)),
+            None => None,
+        };
+    }
+    None
+}
+
 impl Plugin for ApplicationsPlugin {
     fn new() -> Self {
         Self { entries: vec![] }
@@ -123,17 +153,18 @@ impl Plugin for ApplicationsPlugin {
     fn update_entries(&mut self) -> anyhow::Result<()> {
         self.entries.clear();
 
-        let paths =
-            freedesktop_desktop_entry::Iter::new(freedesktop_desktop_entry::default_paths());
+        let paths: Vec<std::path::PathBuf> =
+            freedesktop_desktop_entry::Iter::new(freedesktop_desktop_entry::default_paths())
+                .collect();
+
+        let terminal_command = paths
+            .iter()
+            .filter_map(|path| terminal_command(path))
+            .nth(0);
+
         self.entries = paths
-            .filter_map(|path| {
-                let desktop_entry_result = read_desktop_entry(&path);
-                if let Err(error) = desktop_entry_result {
-                    log::warn!(target: "applications", "Skipping desktop entry: '{:?}'.", error);
-                    return None;
-                }
-                desktop_entry_result.ok()
-            })
+            .iter()
+            .filter_map(|path| read_desktop_entry(path, terminal_command.clone()))
             .collect();
 
         self.entries.sort();

From 6cccc8f710ea8314f7251592c95f800dd3a2e70d Mon Sep 17 00:00:00 2001
From: Christian Friedow <christian@friedow.com>
Date: Tue, 2 Apr 2024 20:37:49 +0200
Subject: [PATCH 3/9] =?UTF-8?q?=F0=9F=9A=A8=20resolve=20review=20comments?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/plugin/applications.rs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/client/src/plugin/applications.rs b/client/src/plugin/applications.rs
index f656d46..e25c969 100644
--- a/client/src/plugin/applications.rs
+++ b/client/src/plugin/applications.rs
@@ -24,7 +24,7 @@ fn read_desktop_entry(
     let desktop_entry = desktop_entry_result.unwrap();
 
     if !is_visible(&desktop_entry) {
-        log::info!(target: "applications", "Desktop entry at path '{:?}' will be hidden because of its properties.", path);
+        log::debug!(target: "applications", "Desktop entry at path '{:?}' will be hidden because of its properties.", path);
         return None;
     }
 
@@ -119,12 +119,11 @@ fn terminal_command(path: &std::path::PathBuf) -> Option<String> {
         .split(";")
         .any(|category| category == "TerminalEmulator")
     {
-        let terminal_cmd: Option<&str> = desktop_entry.exec()?.split_ascii_whitespace().nth(0);
-
-        return match terminal_cmd {
-            Some(cmd) => Some(String::from(cmd)),
-            None => None,
-        };
+        return desktop_entry
+            .exec()?
+            .split_ascii_whitespace()
+            .nth(0)
+            .map(String::from);
     }
     None
 }
@@ -157,10 +156,7 @@ impl Plugin for ApplicationsPlugin {
             freedesktop_desktop_entry::Iter::new(freedesktop_desktop_entry::default_paths())
                 .collect();
 
-        let terminal_command = paths
-            .iter()
-            .filter_map(|path| terminal_command(path))
-            .nth(0);
+        let terminal_command = paths.iter().filter_map(terminal_command).nth(0);
 
         self.entries = paths
             .iter()

From 49a2c91915d08ce1ca3196b13e1eb24d4df15095 Mon Sep 17 00:00:00 2001
From: Christian Friedow <christian@friedow.com>
Date: Tue, 2 Apr 2024 22:10:11 +0200
Subject: [PATCH 4/9] =?UTF-8?q?=F0=9F=90=9B=20deduplicate=20entries?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/plugin/applications.rs | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/client/src/plugin/applications.rs b/client/src/plugin/applications.rs
index 6260f69..9abedfb 100644
--- a/client/src/plugin/applications.rs
+++ b/client/src/plugin/applications.rs
@@ -128,6 +128,28 @@ fn terminal_command(path: &std::path::PathBuf) -> Option<String> {
     None
 }
 
+fn path_name(path: &std::path::PathBuf) -> String {
+    let bytes_result = std::fs::read_to_string(path);
+    if bytes_result.is_err() {
+        return "".into();
+    }
+    let bytes = bytes_result.unwrap();
+
+    let desktop_entry_result = freedesktop_desktop_entry::DesktopEntry::decode(path, &bytes);
+    if desktop_entry_result.is_err() {
+        return "".into();
+    }
+    let desktop_entry = desktop_entry_result.unwrap();
+
+    let locale = std::env::var("LANG").unwrap_or(String::from("en_US"));
+    let name_option = desktop_entry.name(Some(&locale));
+    if name_option.is_none() {
+        return "".into();
+    }
+
+    name_option.unwrap().to_string()
+}
+
 impl Plugin for ApplicationsPlugin {
     fn new() -> Self {
         Self { entries: vec![] }
@@ -156,10 +178,13 @@ impl Plugin for ApplicationsPlugin {
     fn update_entries(&mut self) -> anyhow::Result<()> {
         self.entries.clear();
 
-        let paths: Vec<std::path::PathBuf> =
+        let mut paths: Vec<std::path::PathBuf> =
             freedesktop_desktop_entry::Iter::new(freedesktop_desktop_entry::default_paths())
                 .collect();
 
+        paths.sort_by_key(path_name);
+        paths.dedup_by_key(|path| path_name(path));
+
         let terminal_command = paths.iter().filter_map(terminal_command).nth(0);
 
         self.entries = paths

From 15dfa5dfc5c676581203e317e12bb47ce9804f36 Mon Sep 17 00:00:00 2001
From: Christian Friedow <christian@friedow.com>
Date: Wed, 3 Apr 2024 19:45:55 +0200
Subject: [PATCH 5/9] =?UTF-8?q?=F0=9F=90=9B=20XDG=5FDATA=5FHOME=20now=20ha?=
 =?UTF-8?q?s=20a=20higher=20priority=20then=20XDG=5FDATA=5FDIRS=20when=20r?=
 =?UTF-8?q?eading=20desktop=20entries?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cargo.lock                        |  1 +
 client/Cargo.toml                 |  1 +
 client/src/plugin/applications.rs | 12 ++++++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 983f419..ab51a09 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -547,6 +547,7 @@ dependencies = [
  "sqlite",
  "swayipc",
  "sysinfo",
+ "xdg",
 ]
 
 [[package]]
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 8ee678b..62b8ed2 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -38,6 +38,7 @@ chrono = "0.4.33"
 
 # applications plugin
 freedesktop-desktop-entry = "0.5.1"
+xdg = "2.5.2"
 
 # sway_windows plugin
 swayipc = "3.0.1"
diff --git a/client/src/plugin/applications.rs b/client/src/plugin/applications.rs
index 9abedfb..0f84d6e 100644
--- a/client/src/plugin/applications.rs
+++ b/client/src/plugin/applications.rs
@@ -150,6 +150,15 @@ fn path_name(path: &std::path::PathBuf) -> String {
     name_option.unwrap().to_string()
 }
 
+fn data_dirs() -> Vec<std::path::PathBuf> {
+    let base_dirs = xdg::BaseDirectories::new().unwrap();
+    let mut data_dirs: Vec<std::path::PathBuf> = vec![];
+    data_dirs.push(base_dirs.get_data_home());
+    data_dirs.append(&mut base_dirs.get_data_dirs());
+
+    data_dirs.iter().map(|d| d.join("applications")).collect()
+}
+
 impl Plugin for ApplicationsPlugin {
     fn new() -> Self {
         Self { entries: vec![] }
@@ -179,8 +188,7 @@ impl Plugin for ApplicationsPlugin {
         self.entries.clear();
 
         let mut paths: Vec<std::path::PathBuf> =
-            freedesktop_desktop_entry::Iter::new(freedesktop_desktop_entry::default_paths())
-                .collect();
+            freedesktop_desktop_entry::Iter::new(data_dirs()).collect();
 
         paths.sort_by_key(path_name);
         paths.dedup_by_key(|path| path_name(path));

From 67f0e78eca468cf6ab965d45283c917d415843db Mon Sep 17 00:00:00 2001
From: Christian Friedow <christian@friedow.com>
Date: Thu, 4 Apr 2024 18:40:09 +0200
Subject: [PATCH 6/9] =?UTF-8?q?Revert=20"=F0=9F=90=9B=20XDG=5FDATA=5FHOME?=
 =?UTF-8?q?=20now=20has=20a=20higher=20priority=20then=20XDG=5FDATA=5FDIRS?=
 =?UTF-8?q?=20when=20reading=20desktop=20entries"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 15dfa5dfc5c676581203e317e12bb47ce9804f36.
---
 Cargo.lock                        |  1 -
 client/Cargo.toml                 |  1 -
 client/src/plugin/applications.rs | 12 ++----------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ab51a09..983f419 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -547,7 +547,6 @@ dependencies = [
  "sqlite",
  "swayipc",
  "sysinfo",
- "xdg",
 ]
 
 [[package]]
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 62b8ed2..8ee678b 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -38,7 +38,6 @@ chrono = "0.4.33"
 
 # applications plugin
 freedesktop-desktop-entry = "0.5.1"
-xdg = "2.5.2"
 
 # sway_windows plugin
 swayipc = "3.0.1"
diff --git a/client/src/plugin/applications.rs b/client/src/plugin/applications.rs
index 0f84d6e..9abedfb 100644
--- a/client/src/plugin/applications.rs
+++ b/client/src/plugin/applications.rs
@@ -150,15 +150,6 @@ fn path_name(path: &std::path::PathBuf) -> String {
     name_option.unwrap().to_string()
 }
 
-fn data_dirs() -> Vec<std::path::PathBuf> {
-    let base_dirs = xdg::BaseDirectories::new().unwrap();
-    let mut data_dirs: Vec<std::path::PathBuf> = vec![];
-    data_dirs.push(base_dirs.get_data_home());
-    data_dirs.append(&mut base_dirs.get_data_dirs());
-
-    data_dirs.iter().map(|d| d.join("applications")).collect()
-}
-
 impl Plugin for ApplicationsPlugin {
     fn new() -> Self {
         Self { entries: vec![] }
@@ -188,7 +179,8 @@ impl Plugin for ApplicationsPlugin {
         self.entries.clear();
 
         let mut paths: Vec<std::path::PathBuf> =
-            freedesktop_desktop_entry::Iter::new(data_dirs()).collect();
+            freedesktop_desktop_entry::Iter::new(freedesktop_desktop_entry::default_paths())
+                .collect();
 
         paths.sort_by_key(path_name);
         paths.dedup_by_key(|path| path_name(path));

From cd2371a976f3e9e84e79a810e04d58d1423aa878 Mon Sep 17 00:00:00 2001
From: Christian Friedow <christian@friedow.com>
Date: Tue, 9 Apr 2024 19:25:23 +0200
Subject: [PATCH 7/9] =?UTF-8?q?=E2=8F=AA=EF=B8=8F=20complete=20the=20rever?=
 =?UTF-8?q?t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 983f419..97cf7b0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1109,9 +1109,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "freedesktop-desktop-entry"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287f89b1a3d88dd04d2b65dfec39f3c381efbcded7b736456039c4ee49d54b17"
+checksum = "c201444ddafb5506fe85265b48421664ff4617e3b7090ef99e42a0070c1aead0"
 dependencies = [
  "dirs 3.0.2",
  "gettext-rs",

From 7a30b2a08114acfe16932242eb646bc85bba3edd Mon Sep 17 00:00:00 2001
From: Christian Friedow <christian@friedow.com>
Date: Tue, 9 Apr 2024 21:13:31 +0200
Subject: [PATCH 8/9] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20reduce=20launch=20spee?=
 =?UTF-8?q?d=20of=20the=20plugin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/plugin/applications.rs | 79 ++++++++++++-------------------
 1 file changed, 31 insertions(+), 48 deletions(-)

diff --git a/client/src/plugin/applications.rs b/client/src/plugin/applications.rs
index 9abedfb..6772747 100644
--- a/client/src/plugin/applications.rs
+++ b/client/src/plugin/applications.rs
@@ -5,32 +5,18 @@ pub struct ApplicationsPlugin {
     entries: Vec<crate::model::Entry>,
 }
 
-fn read_desktop_entry(
-    path: &std::path::PathBuf,
+fn to_entry(
+    desktop_entry: &freedesktop_desktop_entry::DesktopEntry,
     terminal_command: Option<String>,
 ) -> Option<crate::model::Entry> {
-    let bytes_result = std::fs::read_to_string(path);
-    if let Err(reading_error) = bytes_result {
-        log::warn!(target: "applications", "Desktop entry at path '{:?}' will be hidden because reading it failed: {}", path, reading_error);
-        return None;
-    }
-    let bytes = bytes_result.unwrap();
-
-    let desktop_entry_result = freedesktop_desktop_entry::DesktopEntry::decode(path, &bytes);
-    if let Err(parsing_error) = desktop_entry_result {
-        log::warn!(target: "applications", "Desktop entry at path '{:?}' will be hidden because parsing it failed: {}", path, parsing_error);
-        return None;
-    }
-    let desktop_entry = desktop_entry_result.unwrap();
+    let locale = std::env::var("LANG").unwrap_or(String::from("en_US"));
+    let title = desktop_entry.name(Some(&locale))?.to_string();
 
     if !is_visible(&desktop_entry) {
-        log::debug!(target: "applications", "Desktop entry at path '{:?}' will be hidden because of its properties.", path);
+        log::debug!(target: "applications", "Desktop entry with name '{}' will be hidden because of its properties.", title);
         return None;
     }
 
-    let locale = std::env::var("LANG").unwrap_or(String::from("en_US"));
-    let title = desktop_entry.name(Some(&locale))?.to_string();
-
     let mut cmd: Vec<String> = desktop_entry
         .exec()?
         .split_ascii_whitespace()
@@ -110,37 +96,22 @@ fn is_visible(desktop_entry: &freedesktop_desktop_entry::DesktopEntry) -> bool {
     true
 }
 
-fn terminal_command(path: &std::path::PathBuf) -> Option<String> {
-    let bytes = std::fs::read_to_string(path).ok()?;
-    let desktop_entry = freedesktop_desktop_entry::DesktopEntry::decode(path, &bytes).ok()?;
-
-    if desktop_entry
+fn terminal_command(desktop_entry: &freedesktop_desktop_entry::DesktopEntry) -> Option<String> {
+    if !desktop_entry
         .categories()?
         .split(";")
         .any(|category| category == "TerminalEmulator")
     {
-        return desktop_entry
-            .exec()?
-            .split_ascii_whitespace()
-            .nth(0)
-            .map(String::from);
+        return None;
     }
-    None
+    return desktop_entry
+        .exec()?
+        .split_ascii_whitespace()
+        .nth(0)
+        .map(String::from);
 }
 
-fn path_name(path: &std::path::PathBuf) -> String {
-    let bytes_result = std::fs::read_to_string(path);
-    if bytes_result.is_err() {
-        return "".into();
-    }
-    let bytes = bytes_result.unwrap();
-
-    let desktop_entry_result = freedesktop_desktop_entry::DesktopEntry::decode(path, &bytes);
-    if desktop_entry_result.is_err() {
-        return "".into();
-    }
-    let desktop_entry = desktop_entry_result.unwrap();
-
+fn name(desktop_entry: &freedesktop_desktop_entry::DesktopEntry) -> String {
     let locale = std::env::var("LANG").unwrap_or(String::from("en_US"));
     let name_option = desktop_entry.name(Some(&locale));
     if name_option.is_none() {
@@ -182,14 +153,26 @@ impl Plugin for ApplicationsPlugin {
             freedesktop_desktop_entry::Iter::new(freedesktop_desktop_entry::default_paths())
                 .collect();
 
-        paths.sort_by_key(path_name);
-        paths.dedup_by_key(|path| path_name(path));
+        let mut bytes_collection: Vec<(&std::path::PathBuf, String)> = paths
+            .iter()
+            .filter_map(|path| Some((path, std::fs::read_to_string(path).ok()?)))
+            .collect();
+
+        let mut desktop_entries: Vec<freedesktop_desktop_entry::DesktopEntry> = bytes_collection
+            .iter()
+            .filter_map(|(bytes, path)| {
+                freedesktop_desktop_entry::DesktopEntry::decode(bytes, path).ok()
+            })
+            .collect();
+
+        desktop_entries.sort_by_key(name);
+        desktop_entries.dedup_by_key(|desktop_entry| name(desktop_entry));
 
-        let terminal_command = paths.iter().filter_map(terminal_command).nth(0);
+        let terminal_command = desktop_entries.iter().find_map(terminal_command);
 
-        self.entries = paths
+        self.entries = desktop_entries
             .iter()
-            .filter_map(|path| read_desktop_entry(path, terminal_command.clone()))
+            .filter_map(|path| to_entry(path, terminal_command.clone()))
             .collect();
 
         self.entries.sort();

From f36b3f45f83397eff42645ceca9d786e9a88924d Mon Sep 17 00:00:00 2001
From: Christian Friedow <christian@friedow.com>
Date: Tue, 9 Apr 2024 21:51:02 +0200
Subject: [PATCH 9/9] =?UTF-8?q?=F0=9F=9A=A8=20implement=20review=20comment?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/plugin/applications.rs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/client/src/plugin/applications.rs b/client/src/plugin/applications.rs
index 6772747..1e7d812 100644
--- a/client/src/plugin/applications.rs
+++ b/client/src/plugin/applications.rs
@@ -9,8 +9,7 @@ fn to_entry(
     desktop_entry: &freedesktop_desktop_entry::DesktopEntry,
     terminal_command: Option<String>,
 ) -> Option<crate::model::Entry> {
-    let locale = std::env::var("LANG").unwrap_or(String::from("en_US"));
-    let title = desktop_entry.name(Some(&locale))?.to_string();
+    let title = name(desktop_entry);
 
     if !is_visible(&desktop_entry) {
         log::debug!(target: "applications", "Desktop entry with name '{}' will be hidden because of its properties.", title);
@@ -113,12 +112,10 @@ fn terminal_command(desktop_entry: &freedesktop_desktop_entry::DesktopEntry) ->
 
 fn name(desktop_entry: &freedesktop_desktop_entry::DesktopEntry) -> String {
     let locale = std::env::var("LANG").unwrap_or(String::from("en_US"));
-    let name_option = desktop_entry.name(Some(&locale));
-    if name_option.is_none() {
-        return "".into();
-    }
-
-    name_option.unwrap().to_string()
+    desktop_entry
+        .name(Some(&locale))
+        .unwrap_or_default()
+        .to_string()
 }
 
 impl Plugin for ApplicationsPlugin {
@@ -149,11 +146,11 @@ impl Plugin for ApplicationsPlugin {
     fn update_entries(&mut self) -> anyhow::Result<()> {
         self.entries.clear();
 
-        let mut paths: Vec<std::path::PathBuf> =
+        let paths: Vec<std::path::PathBuf> =
             freedesktop_desktop_entry::Iter::new(freedesktop_desktop_entry::default_paths())
                 .collect();
 
-        let mut bytes_collection: Vec<(&std::path::PathBuf, String)> = paths
+        let bytes_collection: Vec<(&std::path::PathBuf, String)> = paths
             .iter()
             .filter_map(|path| Some((path, std::fs::read_to_string(path).ok()?)))
             .collect();