From aca8b408755f9041da9ee083c625de2a8d8c6785 Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Thu, 22 Jan 2026 08:32:29 +0800 Subject: Refactor CLI command processing with new architecture --- src/subcmd/cmd.rs | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 src/subcmd/cmd.rs (limited to 'src/subcmd/cmd.rs') diff --git a/src/subcmd/cmd.rs b/src/subcmd/cmd.rs new file mode 100644 index 0000000..10ad893 --- /dev/null +++ b/src/subcmd/cmd.rs @@ -0,0 +1,85 @@ +use serde::Serialize; + +use crate::{ + r_println, + subcmd::{ + errors::{CmdExecuteError, CmdPrepareError, CmdProcessError}, + renderer::{JVRenderResult, JVResultRenderer}, + }, +}; +use std::future::Future; + +pub struct JVCommandContext { + pub help: bool, + pub confirmed: bool, +} + +pub trait JVCommand +where + Argument: clap::Parser + Send + Sync, + Input: Send + Sync, + Output: Serialize + Send + Sync, + Renderer: JVResultRenderer + Send + Sync, +{ + /// Get help string for the command + fn get_help_str() -> String; + + /// performing any necessary post-execution processing + fn process( + args: Vec, + ctx: JVCommandContext, + ) -> impl Future> + Send + Sync + where + Self: Sync, + { + Self::process_with_renderer::(args, ctx) + } + + /// Process the command output with a custom renderer, + /// performing any necessary post-execution processing + fn process_with_renderer + Send + Sync>( + args: Vec, + ctx: JVCommandContext, + ) -> impl Future> + Send + Sync + where + Self: Sync, + { + async move { + let mut full_args = vec!["jv".to_string()]; + full_args.extend(args); + let parsed_args = match Argument::try_parse_from(full_args) { + Ok(args) => args, + Err(_) => return Err(CmdProcessError::ParseError(Self::get_help_str())), + }; + // If the help flag is used, skip execution and directly print help + if ctx.help { + let mut r = JVRenderResult::default(); + r_println!(r, "{}", Self::get_help_str()); + return Ok(r); + } + let input = match Self::prepare(parsed_args, ctx).await { + Ok(input) => input, + Err(e) => return Err(CmdProcessError::from(e)), + }; + let output = match Self::exec(input).await { + Ok(output) => output, + Err(e) => return Err(CmdProcessError::from(e)), + }; + match R::render(&output).await { + Ok(r) => Ok(r), + Err(e) => Err(CmdProcessError::from(e)), + } + } + } + + /// Prepare to run the command, + /// converting Clap input into the command's supported input + fn prepare( + args: Argument, + ctx: JVCommandContext, + ) -> impl Future> + Send + Sync; + + /// Run the command phase, + /// returning an output structure, waiting for rendering + fn exec(args: Input) -> impl Future> + Send + Sync; +} -- cgit