:3

1 files changed, 49 insertions, 36 deletions

diff --git a/.config/awesome/quarrel/native/src/lenses/application.rs b/.config/awesome/quarrel/native/src/lenses/application.rs
index 72aba8d..89b7bb4 100644
--- a/.config/awesome/quarrel/native/src/lenses/application.rs
+++ b/.config/awesome/quarrel/native/src/lenses/application.rs
@@ -1,6 +1,5 @@
 use std::{
-    fs::read_dir,
-    path::PathBuf,
+    fs::read_dir, path::PathBuf
 };
 
 use freedesktop_entry_parser as fd;
@@ -8,12 +7,54 @@ use mlua::prelude::*;
 use rayon::prelude::*;
 use url::Url;
 
-use crate::lenses::entry::{
-    entries_to_lua_table,
+use crate::lenses::{
     Entry,
+    Lense,
+    Cache
 };
 
-fn parse_entry(entry: &fd::Entry, path: &PathBuf) -> Result<Entry, ()> {
+#[derive(Default)]
+pub struct Application(pub Cache);
+
+impl Lense for Application {
+    const NAME: &str = "Application";
+
+    fn get_cache(&self) -> &Cache {
+        &self.0
+    }
+
+    fn set_cache(&mut self, cache: Cache) {
+        self.0 = cache;
+    }
+
+    fn query(_: &Lua, input: String) -> Result<Vec<Entry>, anyhow::Error> {
+        let applications_dir = "/usr/share/applications";
+        let entries = read_dir(applications_dir)?
+            .map(|result| result.map(|e| e.path()))
+            .collect::<Result<Vec<_>, std::io::Error>>()?;
+
+        let parsed_entries: Vec<Entry> = entries
+            .into_par_iter()
+            .filter(|path| path.extension().is_some_and(|ext| ext == "desktop"))
+            .filter_map(|path| {
+                parse_entry(path).ok().flatten()
+            })
+            .collect();
+
+        Ok(
+            parsed_entries
+                .into_iter()
+                .filter(|entry| entry.message.to_lowercase().contains(&input.to_lowercase()))
+                .collect(),
+        )
+    }
+}
+
+fn parse_entry(path: PathBuf) -> Result<Option<Entry>, ()> {
+    let Ok(entry) = fd::parse_entry(&path) else {
+        return Err(())
+    };
+
     let section = entry.section("Desktop Entry");
     let name = section.attr("Name").ok_or(())?.to_string();
 
@@ -38,14 +79,14 @@ fn parse_entry(entry: &fd::Entry, path: &PathBuf) -> Result<Entry, ()> {
                 }
             }
             'c' => new_exec.replace_range(index..index + 2, &name),
-            'k' => new_exec.replace_range(index..index + 2, Url::from_file_path(path)?.as_str()),
+            'k' => new_exec.replace_range(index..index + 2, Url::from_file_path(&path)?.as_str()),
 
             'f' | 'u' | 'v' | 'm' | 'd' | 'n' => new_exec.replace_range(index..index + 2, ""),
             _ => continue,
         }
     }
 
-    Ok(Entry {
+    Ok(Some(Entry {
         message: name,
         exec: Some((
             new_exec,
@@ -55,33 +96,5 @@ fn parse_entry(entry: &fd::Entry, path: &PathBuf) -> Result<Entry, ()> {
                 .parse()
                 .map_err(drop)?,
         )),
-        provider: "Application".to_string(),
-    })
-}
-
-pub fn query(lua: &Lua, input: String) -> LuaResult<LuaTable> {
-    let applications_dir = "/usr/share/applications";
-    let entries = read_dir(applications_dir)?
-        .map(|result| result.map(|e| e.path()))
-        .collect::<Result<Vec<_>, std::io::Error>>()?;
-
-    let parsed_entries: Vec<Entry> = entries
-        .into_par_iter()
-        .filter(|path| matches!(path.extension(), Some(ext) if ext == "desktop"))
-        .filter_map(|path| {
-            let Ok(entry) = fd::parse_entry(&path) else {
-                return None
-            };
-
-            parse_entry(&entry, &path).ok()
-        })
-        .collect();
-
-    Ok(entries_to_lua_table(
-        parsed_entries
-            .into_iter()
-            .filter(|entry| entry.message.to_lowercase().contains(&input.to_lowercase()))
-            .collect(),
-        lua,
-    ))
+    }))
 }