Use subcommands in the commandline

Author: bosschaert

src/bin/main.rs

@@ -1,44 +1,51 @@
-use clap::Parser;
+use clap::{Args, Parser, Subcommand};
 use tempfile::tempdir;
 
 use docxtools::xml_util::XMLUtil;
 use docxtools::zip_util::ZipUtil;
 
-#[derive(Parser, Debug)]
+#[derive(Parser)]
 #[command(author, version, about, long_about = None)]
-struct Args {
-    #[arg(long)]
-    command: String,
-
-    #[arg(long)]
-    grep_pattern: Option<String>,
-
+#[command(propagate_version = true)]
+struct Cli {
     /// The docx file to operate on.
     #[arg(short, long)]
     in_file: String,
 
-    // #[arg(short, long)]
-    // out_file: String,
-
     /// The temporary directory to use. If not specified a system temp directory
     /// will be used and cleaned after use.
     #[arg(short, long)]
-    temp_dir: Option<String>
+    temp_dir: Option<String>,
+
+    #[command(subcommand)]
+    command: Commands,
+}
+
+#[derive(Subcommand)]
+enum Commands {
+    /// List the text from the document to the console
+    Cat(CatArgs),
+
+    /// Search the text in the document like 'grep'
+    Grep(GrepArgs),
+}
+
+#[derive(Args)]
+struct CatArgs {
+}
+
+#[derive(Args)]
+struct GrepArgs {
+    regex: String,
 }
+
 fn main() {
-    let args = Args::parse();
+    let args = Cli::parse();
 
     std::process::exit(real_main(args));
 }
 
-fn real_main(args: Args) -> i32 {
-    // let args: Vec<_> = std::env::args().collect();
-    // if args.len() < 4 {
-    //     println!("Usage: {} <in-filename> <out-filename> <tempdir>", args[0]);
-    //     return 1;
-    // }
-
-    // let src_file = &*args[1];
+fn real_main(args: Cli) -> i32 {
     let src_file = args.in_file;
     // let dest_file = args.out_file;
 
@@ -51,19 +58,17 @@ fn real_main(args: Args) -> i32 {
         temp_dir = fstempdir.path().to_string_lossy().to_string();
     }
 
-    // let temp_dir = args.temp_dir;
-
     ZipUtil::read_zip(&src_file, &temp_dir).unwrap();
 
-    match args.command.as_str() {
-        "cat" => {
+    match &args.command {
+        Commands::Cat(_) => {
             XMLUtil::cat(&temp_dir);
         },
-        "grep" => {
-            XMLUtil::grep_xml(&temp_dir, &args.grep_pattern.unwrap())
-        },
-        _ => panic!("Unknown command {}", args.command)
+        Commands::Grep(grep_args) => {
+            XMLUtil::grep_xml(&temp_dir, &grep_args.regex)
+        }
     }
+
     // XMLUtil::read_xmls(&temp_dir); // .unwrap();
 
     // ZipUtil::write_zip(&temp_dir, &dest_file).unwrap();

src/xml_util.rs

@@ -86,6 +86,7 @@ impl XMLUtil {
         }
     }
 
+    // Below here is all experimental code
     fn read_node(node: &mut RefNode) {
         for mut r in node.child_nodes() {
             let val = r.node_value();