:3

1 files changed, 28 insertions, 17 deletions

diff --git a/.config/awesome/quarrel/native/src/lenses/calculator.rs b/.config/awesome/quarrel/native/src/lenses/calculator.rs
index 07f1ee2..640bdeb 100644
--- a/.config/awesome/quarrel/native/src/lenses/calculator.rs
+++ b/.config/awesome/quarrel/native/src/lenses/calculator.rs
@@ -5,25 +5,36 @@ use cpc::{
 };
 use mlua::prelude::*;
 
-use crate::lenses::entry::{
-    entries_to_lua_table,
+use crate::lenses::{
     Entry,
+    Cache,
+    Lense
 };
 
-pub fn query(lua: &Lua, input: String) -> LuaResult<LuaTable> {
-    let result = match eval(input.trim(), true, Unit::Celsius, false) {
-        Ok(result) => {
-            format!("{result}")
-        }
-        Err(_) => return lua.create_table(),
-    };
+pub struct Calculator;
 
-    Ok(entries_to_lua_table(
-        vec![Entry {
-            message: result,
-            exec: None,
-            provider: "Calculator".to_string(),
-        }],
-        lua,
-    ))
+impl Lense for Calculator {
+    const NAME: &str = "Calculator";
+
+    fn get_cache(&self) -> &Cache {
+        &Cache::Stale
+    }
+
+    fn set_cache(&mut self, _: Cache) {}
+
+    fn query(_: &Lua, input: String) -> Result<Vec<Entry>, anyhow::Error> {
+        let result = match eval(input.trim(), true, Unit::Celsius, false) {
+            Ok(result) => {
+                format!("{result}")
+            }
+            Err(err) => { return Err(anyhow::anyhow!(err)); },
+        };
+
+        Ok(vec![Entry {
+                message: result,
+                exec: None,
+            }; 1]
+        )
+    }
 }
+