From 4900c0e047332ea87b44bb706fe0bd4e650deccf Mon Sep 17 00:00:00 2001 From: Erik Kundt Date: Sat, 25 Jan 2025 13:20:19 +0100 Subject: [PATCH] bin: Call `rad` for all unknown commands --- bin/commands/help.rs | 5 +++-- bin/main.rs | 27 +++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bin/commands/help.rs b/bin/commands/help.rs index 9cea6747..d3a65950 100644 --- a/bin/commands/help.rs +++ b/bin/commands/help.rs @@ -1,9 +1,10 @@ use std::ffi::OsString; +use radicle_cli::terminal as cli_term; use radicle_term as term; -use crate::terminal::args::{Args, Error, Help}; -use crate::terminal::Context; +use cli_term::args::{Args, Error, Help}; +use cli_term::Context; use super::*; diff --git a/bin/main.rs b/bin/main.rs index ccf0fb0b..7ae86962 100644 --- a/bin/main.rs +++ b/bin/main.rs @@ -3,6 +3,7 @@ mod commands; mod git; mod log; mod settings; +mod terminal; #[cfg(test)] mod test; mod ui; @@ -12,14 +13,12 @@ use std::io; use std::io::Write; use std::{iter, process}; -use anyhow::anyhow; - use radicle::version::Version; -use radicle_cli::terminal; -use radicle_term as term; +use radicle_cli::terminal as cli_term; use commands::*; +use terminal as term; pub const NAME: &str = "rad-tui"; pub const DESCRIPTION: &str = "Radicle terminal interfaces"; @@ -45,7 +44,7 @@ fn main() { Ok(_) => process::exit(0), Err(err) => { if let Some(err) = err { - term::error(format!("rad-tui: {err}")); + radicle_term::error(format!("rad-tui: {err}")); } process::exit(1); } @@ -103,7 +102,7 @@ fn print_help() -> anyhow::Result<()> { println!("{DESCRIPTION}"); println!(); - tui_help::run(Default::default(), terminal::DefaultContext) + tui_help::run(Default::default(), cli_term::DefaultContext) } fn run(command: Command) -> Result<(), Option> { @@ -132,31 +131,31 @@ fn run(command: Command) -> Result<(), Option> { Ok(()) } -fn run_other(exe: &str, args: &[OsString]) -> Result<(), Option> { - match exe { +fn run_other(command: &str, args: &[OsString]) -> Result<(), Option> { + match command { "issue" => { - terminal::run_command_args::( + term::run_command_args::( tui_issue::HELP, tui_issue::run, args.to_vec(), ); } "patch" => { - terminal::run_command_args::( + term::run_command_args::( tui_patch::HELP, tui_patch::run, args.to_vec(), ); } "inbox" => { - terminal::run_command_args::( + term::run_command_args::( tui_inbox::HELP, tui_inbox::run, args.to_vec(), ); } - other => Err(Some(anyhow!( - "`rad-tui {other}` is not a command. See `rad-tui --help` for a list of commands.", - ))), + command => { + term::run_rad(command, &args) + } } }