move keybinding handling to intuitils

intuis · Sep 19, 2024 · 42c0f5e · 42c0f5e
1 parent 07d4a2d
commit 42c0f5e
Show file tree

Hide file tree

Showing 16 changed files with 207 additions and 554 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,6 +17,8 @@ license = "GPL-3.0-or-later"
 rm-config = { version = "0.5", path = "rm-config" }
 rm-shared = { version = "0.5", path = "rm-shared" }
 
+intuitils = "0.0.2"
+
 magnetease = "0.3"
 anyhow = "1"
 serde = { version = "1", features = ["derive"] }

diff --git a/rm-config/Cargo.toml b/rm-config/Cargo.toml
@@ -22,3 +22,4 @@ crossterm.workspace = true
 thiserror.workspace = true
 transmission-rpc.workspace = true
 magnetease.workspace = true
+intuitils.workspace = true
diff --git a/rm-config/src/keymap/actions/general.rs b/rm-config/src/keymap/actions/general.rs
@@ -1,9 +1,8 @@
+use intuitils::user_action::UserAction;
 use rm_shared::action::Action;
 use serde::{Deserialize, Serialize};
 
-use super::UserAction;
-
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum GeneralAction {
     ShowHelp,
     Quit,

diff --git a/rm-config/src/keymap/actions/mod.rs b/rm-config/src/keymap/actions/mod.rs
@@ -1,13 +1,3 @@
-use rm_shared::action::Action;
-
 pub mod general;
 pub mod search_tab;
 pub mod torrents_tab;
-
-pub trait UserAction: Into<Action> {
-    fn desc(&self) -> &'static str;
-    fn merge_desc_with(&self, other: &Self) -> Option<&'static str> {
-        let _ = other;
-        None
-    }
-}
diff --git a/rm-config/src/keymap/actions/search_tab.rs b/rm-config/src/keymap/actions/search_tab.rs
@@ -1,9 +1,8 @@
+use intuitils::user_action::UserAction;
 use rm_shared::action::Action;
 use serde::{Deserialize, Serialize};
 
-use super::UserAction;
-
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum SearchAction {
     ShowProvidersInfo,
 }

diff --git a/rm-config/src/keymap/actions/torrents_tab.rs b/rm-config/src/keymap/actions/torrents_tab.rs
@@ -1,9 +1,8 @@
+use intuitils::user_action::UserAction;
 use rm_shared::action::Action;
 use serde::{Deserialize, Serialize};
 
-use super::UserAction;
-
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum TorrentsAction {
     AddMagnet,
     MoveTorrent,