refactor: merge app.rs and main.rs

Author: shalzz

Cargo.lock

@@ -17,7 +17,7 @@ edition = "2018"
 uuid = { version = "0.5", features = ["v4"] }
 atomicwrites = "0.1"
 email = "0.0"
-clap = "2.31"
+clap = "2.33.0"
 vobject = "0.2"
 cursive = "0.14"
 anyhow = "1.0.26"

Cargo.toml

@@ -7,7 +7,6 @@ extern crate email;
 extern crate uuid;
 extern crate vobject;
 
-pub mod app;
 pub mod cli;
 mod editor;
 pub mod utils;

src/app.rs

@@ -4,15 +4,43 @@ use anyhow::Result;
 use std::fs;
 use std::io;
 use std::io::{Read, Write};
+use clap::{App, AppSettings, Arg, SubCommand};
 
-use mates::app;
 use mates::cli;
 use mates::utils;
 
 fn main() -> Result<()> {
-    let matches = app::app().get_matches();
-
-    let command = matches.subcommand_name().unwrap();
+    let app = App::new("mates")
+        .version(env!("CARGO_PKG_VERSION"))
+        .author("Markus Unterwaditzer")
+        .about("A simple commandline addressbook")
+        .setting(AppSettings::SubcommandRequired)
+        .subcommand(SubCommand::with_name("index").about("Rewrite/create the index"))
+        .subcommand(
+            SubCommand::with_name("mutt-query")
+                .about("Search for contact, output is usable for mutt's query_command.")
+                .arg(Arg::with_name("query").index(1)),
+        )
+        .subcommand(
+            SubCommand::with_name("file-query")
+                .about("Search for contact, return just the filename.")
+                .arg(Arg::with_name("query").index(1)),
+        )
+        .subcommand(
+            SubCommand::with_name("email-query")
+                .about("Search for contact, return \"name <email>\".")
+                .arg(Arg::with_name("query").index(1)),
+        )
+        .subcommand(
+            SubCommand::with_name("add")
+                .about("Take mail from stdin, add sender to contacts. Print filename."),
+        )
+        .subcommand(
+            SubCommand::with_name("edit")
+                .about("Open contact (given by filepath or search-string) interactively.")
+                .arg(Arg::with_name("file-or-query").index(1)),
+        )
+        .get_matches();
 
     let config = match cli::Configuration::new() {
         Ok(x) => x,
@@ -21,31 +49,30 @@ fn main() -> Result<()> {
         }
     };
 
-    let submatches = matches
-        .subcommand_matches(command)
-        .expect("Internal error.");
-
-    match command {
-        "index" => {
+    match app.subcommand() {
+        ("index", Some(_subs)) => {
             println!(
                 "Rebuilding index file \"{}\"...",
                 config.index_path.display()
             );
             cli::build_index(&config.index_path, &config.vdir_path)?;
         }
-        "mutt-query" => {
-            let query = submatches.value_of("query").unwrap_or("");
-            cli::mutt_query(&config, &query[..])?;
+        ("mutt-query", Some(subs)) => {
+            if let Some(value) = subs.value_of("query") {
+                cli::mutt_query(&config, value)?
+            }
         }
-        "file-query" => {
-            let query = submatches.value_of("query").unwrap_or("");
-            cli::file_query(&config, &query[..])?;
+        ("file-query", Some(subs)) => {
+            if let Some(value) = subs.value_of("query") {
+                cli::file_query(&config, value)?
+            }
         }
-        "email-query" => {
-            let query = submatches.value_of("query").unwrap_or("");
-            cli::email_query(&config, &query[..])?;
+        ("email-query", Some(subs)) => {
+            if let Some(value) = subs.value_of("query") {
+                cli::email_query(&config, value)?
+            }
         }
-        "add" => {
+        ("add", Some(..)) => {
             let stdin = io::stdin();
             let mut email = String::new();
             stdin.lock().read_to_string(&mut email)?;
@@ -60,13 +87,13 @@ fn main() -> Result<()> {
             let index_entry = utils::index_item_from_contact(&contact)?;
             index_fp.write_all(index_entry.as_bytes())?;
         }
-        "edit" => {
-            let query = submatches.value_of("file-or-query").unwrap_or("");
-            cli::edit_contact(&config, &query[..])?;
-        }
-        _ => {
-            return Err(anyhow!("Invalid command: {}", command));
+        ("edit", Some(subs)) => {
+            if let Some(value) = subs.value_of("file-or-query") {
+                cli::edit_contact(&config, value)?
+            }
         }
-    };
+        _ => (),
+    }
+
     Ok(())
 }