Rename subcmd module to cmd and update references

1 files changed, 0 insertions, 85 deletions

diff --git a/src/subcmd/cmd.rs b/src/subcmd/cmd.rs
deleted file mode 100644
index 10ad893..0000000
--- a/src/subcmd/cmd.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-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<Argument, Input, Output, Renderer>
-where
-    Argument: clap::Parser + Send + Sync,
-    Input: Send + Sync,
-    Output: Serialize + Send + Sync,
-    Renderer: JVResultRenderer<Output> + Send + Sync,
-{
-    /// Get help string for the command
-    fn get_help_str() -> String;
-
-    /// performing any necessary post-execution processing
-    fn process(
-        args: Vec<String>,
-        ctx: JVCommandContext,
-    ) -> impl Future<Output = Result<JVRenderResult, CmdProcessError>> + Send + Sync
-    where
-        Self: Sync,
-    {
-        Self::process_with_renderer::<Renderer>(args, ctx)
-    }
-
-    /// Process the command output with a custom renderer,
-    /// performing any necessary post-execution processing
-    fn process_with_renderer<R: JVResultRenderer<Output> + Send + Sync>(
-        args: Vec<String>,
-        ctx: JVCommandContext,
-    ) -> impl Future<Output = Result<JVRenderResult, CmdProcessError>> + 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<Output = Result<Input, CmdPrepareError>> + Send + Sync;
-
-    /// Run the command phase,
-    /// returning an output structure, waiting for rendering
-    fn exec(args: Input) -> impl Future<Output = Result<Output, CmdExecuteError>> + Send + Sync;
-}