refactore runnable

3 files changed, 11 insertions, 45 deletions

diff --git a/src/config/keymap/keymap_store.rs b/src/config/keymap/keymap_store.rs
index 233ac52..e5e32e5 100644
--- a/src/config/keymap/keymap_store.rs
+++ b/src/config/keymap/keymap_store.rs
@@ -4,14 +4,13 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-use mlua::{Function, RegistryKey, Result};
 use ratatui::crossterm::event::KeyEvent;
 
-use crate::lua;
+use crate::lua::runnable::Runnable;
 
 #[derive(Default, Clone)]
 pub struct KeyMapStore {
-    store: Option<HashMap<KeyEvent, Arc<Mutex<dyn Runnable>>>>,
+    store: Option<HashMap<KeyEvent, Arc<Mutex<dyn Runnable<(), bool>>>>>,
 }
 
 impl KeyMapStore {
@@ -19,7 +18,7 @@ impl KeyMapStore {
         Self { store: None }
     }
 
-    pub fn get(&mut self, event: KeyEvent) -> Option<Arc<Mutex<dyn Runnable>>> {
+    pub fn get(&mut self, event: KeyEvent) -> Option<Arc<Mutex<dyn Runnable<(), bool>>>> {
         match &self.store {
             Some(store) => match store.get(&event) {
                 Some(func) => Some(Arc::clone(func)),
@@ -32,7 +31,7 @@ impl KeyMapStore {
         }
     }
 
-    pub fn map(&mut self, event: KeyEvent, func: impl Runnable + 'static) {
+    pub fn map(&mut self, event: KeyEvent, func: impl Runnable<(), bool> + 'static) {
         match &self.store {
             Some(_) => {}
             None => self.store = Some(HashMap::new()),
@@ -44,34 +43,6 @@ impl KeyMapStore {
     }
 }
 
-pub trait Runnable
-where
-    Self: Send,
-{
-    fn run(&self) -> Result<bool>;
-}
-
-impl<T> Runnable for T
-where
-    T: Fn() -> bool,
-    Self: Send,
-{
-    fn run(&self) -> Result<bool> {
-        Ok(self())
-    }
-}
-
-impl Runnable for RegistryKey
-where
-    Self: Send,
-{
-    fn run(&self) -> Result<bool> {
-        let lua = lua::get();
-        let func: Function = lua.registry_value(self)?;
-        Ok(func.call::<(), bool>(()).unwrap_or(false))
-    }
-}
-
 impl fmt::Debug for KeyMapStore {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "KeyMapStore")
diff --git a/src/config/keymap/mod.rs b/src/config/keymap/mod.rs
index dc97ccc..3ff9f04 100644
--- a/src/config/keymap/mod.rs
+++ b/src/config/keymap/mod.rs
@@ -1,12 +1,10 @@
-use mlua::{Function, UserData};
+use mlua::UserData;
 use ratatui::crossterm::event::KeyEvent;
 
-use self::{
-    event_from_string::event_from_string,
-    keymap_store::{KeyMapStore, Runnable},
-};
+use self::{event_from_string::event_from_string, keymap_store::KeyMapStore};
 
 use super::{GlobalConfig, DUMMY_CONFIG};
+use crate::lua::{self, ownedfunction::OwnedFunction, runnable::Runnable};
 use template::KeyMapSections;
 
 pub mod event_from_string;
@@ -46,4 +44,3 @@ KeyMap!(
     GlobalKeyMap => global,
     EditorKeyMap => editor,
 );
-
diff --git a/src/config/keymap/template.rs b/src/config/keymap/template.rs
index 5425eb8..cf68f80 100644
--- a/src/config/keymap/template.rs
+++ b/src/config/keymap/template.rs
@@ -23,7 +23,7 @@ macro_rules! KeyMapSections {
 
                     if let Some(func) = func {
                         let func = func.lock().unwrap();
-                        match func.run() {
+                        match func.run((), &lua::get()) {
                             Ok(value) => value,
                             _ => def
                         }
@@ -32,7 +32,7 @@ macro_rules! KeyMapSections {
                     }
                 }
 
-                pub fn map(event: KeyEvent, func: impl Runnable + 'static) {
+                pub fn map(event: KeyEvent, func: impl Runnable<(), bool> + 'static) {
                     GlobalConfig::instance_mut()
                         .keymap
                         .$key
@@ -56,11 +56,9 @@ macro_rules! KeyMapSections {
                 fn add_methods<'lua, M: mlua::prelude::LuaUserDataMethods<'lua, Self>>(
                     methods: &mut M,
                 ) {
-                    methods.add_function("map", |lua, (event, func): (String, Function<'_>)| {
-                        let key = lua.create_registry_value(func)?;
-
+                    methods.add_function("map", |_, (event, func): (String, OwnedFunction)| {
                         if let Ok(event) = event_from_string(event) {
-                            $name::map(event, key);
+                            $name::map(event, func);
                         }
                         Ok(())
                     });