From 5d77eace77ff3704f06304dafda84db9df2dad9c Mon Sep 17 00:00:00 2001 From: Val Lorentz Date: Sun, 29 Oct 2023 16:49:05 +0100 Subject: [PATCH] Add a basic command system instead of refering to actions directly from the config --- .config/config.json5 | 8 ++-- Cargo.toml | 1 + src/action.rs | 4 +- src/app.rs | 12 +++--- src/commands/mod.rs | 99 ++++++++++++++++++++++++++++++++++++++++++++ src/config.rs | 4 +- src/main.rs | 1 + 7 files changed, 116 insertions(+), 13 deletions(-) create mode 100644 src/commands/mod.rs diff --git a/.config/config.json5 b/.config/config.json5 index c746239..f880b2b 100644 --- a/.config/config.json5 +++ b/.config/config.json5 @@ -1,10 +1,10 @@ { "keybindings": { "Home": { - "": "Quit", // Quit the application - "": "Quit", // Another way to quit - "": "Quit", // Yet another way to quit - "": "Suspend" // Suspend the application + "": "/quit", // Quit the application + "": "/quit", // Another way to quit + "": "/quit", // Yet another way to quit + "": "/suspend" // Suspend the application }, } } diff --git a/Cargo.toml b/Cargo.toml index e7e39cd..5ecde91 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,6 +19,7 @@ derive_deref = "1.1.1" directories = "5.0.1" futures = "0.3.28" human-panic = "1.2.0" +inventory = "0.3" json5 = "0.4.1" lazy_static = "1.4.0" libc = "0.2.148" diff --git a/src/action.rs b/src/action.rs index 1396f36..7ed2b77 100644 --- a/src/action.rs +++ b/src/action.rs @@ -5,7 +5,7 @@ use serde::{ Deserialize, Serialize, }; -#[derive(Debug, Clone, PartialEq, Eq, Serialize)] +#[derive(Debug, Clone, PartialEq, Eq)] pub enum Action { Tick, Render, @@ -18,6 +18,7 @@ pub enum Action { Help, } +/* impl<'de> Deserialize<'de> for Action { fn deserialize(deserializer: D) -> Result where @@ -70,3 +71,4 @@ impl<'de> Deserialize<'de> for Action { deserializer.deserialize_str(ActionVisitor) } } +*/ diff --git a/src/app.rs b/src/app.rs index d1f641b..e6ada9d 100644 --- a/src/app.rs +++ b/src/app.rs @@ -71,18 +71,18 @@ impl App { tui::Event::Resize(x, y) => action_tx.send(Action::Resize(x, y))?, tui::Event::Key(key) => { if let Some(keymap) = self.config.keybindings.get(&self.mode) { - if let Some(action) = keymap.get(&vec![key]) { - log::info!("Got action: {action:?}"); - action_tx.send(action.clone())?; + if let Some(command_line) = keymap.get(&vec![key]) { + log::info!("Got command: {command_line}"); + crate::commands::run_command(command_line, &action_tx)?; } else { // If the key was not handled as a single key action, // then consider it for multi-key combinations. self.last_tick_key_events.push(key); // Check for multi-key combinations - if let Some(action) = keymap.get(&self.last_tick_key_events) { - log::info!("Got action: {action:?}"); - action_tx.send(action.clone())?; + if let Some(command_line) = keymap.get(&self.last_tick_key_events) { + log::info!("Got command: {command_line}"); + crate::commands::run_command(command_line, &action_tx)?; } } }; diff --git a/src/commands/mod.rs b/src/commands/mod.rs new file mode 100644 index 0000000..5e2e4cf --- /dev/null +++ b/src/commands/mod.rs @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2023 Valentin Lorentz + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +use clap::{ArgMatches, Command, Parser}; +use color_eyre::eyre::{anyhow, bail, Result, WrapErr}; +use tokio::sync::mpsc; + +use crate::action::Action; + +pub type CommandHandler = fn(&str, &str, &mpsc::UnboundedSender) -> Result<()>; + +pub struct RataCommand { + pub name: &'static str, + pub help: &'static str, + pub handler: CommandHandler, +} + +inventory::collect!(RataCommand); + +/* +pub fn parser() -> Command { + inventory::iter::().fold( + Command::new("ratatrix") + .bin_name("") + .subcommand_required(true), + |parser, command| { + if command.command.get_bin_name().is_none() { + panic!("Command {:?} has no bin_name", command.command); + } + parser.subcommand(command.command.clone()) + }, + ) +}*/ + +pub fn run_command(command_line: &str, action_tx: &mpsc::UnboundedSender) -> Result<()> { + if command_line.bytes().nth(0) != Some(b'/') { + bail!("Not a command: {}", command_line); + } + + let (command_name, args) = match command_line[1..].split_once(" ") { + Some((command_name, args)) => (command_name, args), + None => (&command_line[1..], ""), + }; + + for command in inventory::iter::() { + if command.name == command_name.to_ascii_lowercase() { + return (command.handler)(command_name, args, action_tx); + } + } + + bail!("Unknown command /{}", command_name) +} + +inventory::submit! { + RataCommand { + name: "quit", + help: "Exits the process", + handler: quit_handler, + } +} + +fn quit_handler(_name: &str, _args: &str, action_tx: &mpsc::UnboundedSender) -> Result<()> { + action_tx + .send(Action::Quit) + .context("Could not queue quit action")?; + Ok(()) +} + +inventory::submit! { + RataCommand { + name: "suspend", + help: "Puts the process in the background", + handler: suspend_handler, + } +} + +fn suspend_handler( + _name: &str, + _args: &str, + action_tx: &mpsc::UnboundedSender, +) -> Result<()> { + action_tx + .send(Action::Suspend) + .context("Could not queue suspend action")?; + Ok(()) +} diff --git a/src/config.rs b/src/config.rs index f0be547..fd3dca5 100644 --- a/src/config.rs +++ b/src/config.rs @@ -88,14 +88,14 @@ impl Config { } #[derive(Clone, Debug, Default, Deref, DerefMut)] -pub struct KeyBindings(pub HashMap, Action>>); +pub struct KeyBindings(pub HashMap, String>>); impl<'de> Deserialize<'de> for KeyBindings { fn deserialize(deserializer: D) -> Result where D: Deserializer<'de>, { - let parsed_map = HashMap::>::deserialize(deserializer)?; + let parsed_map = HashMap::>::deserialize(deserializer)?; let keybindings = parsed_map .into_iter() diff --git a/src/main.rs b/src/main.rs index cd3303b..ac464c8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,6 +5,7 @@ pub mod action; pub mod app; pub mod cli; +pub mod commands; pub mod components; pub mod config; pub mod mode;