add arg to disable empty line with mutt-query

Author: shalzz

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "mates"
-version = "0.3.0"
-authors = ["Markus Unterwaditzer <[email protected]>"]
+version = "1.0.0"
+authors = ["Markus Unterwaditzer <[email protected]>", "Shaleen Jain <[email protected]>"]
 license = "MIT"
 keywords = ["vdir", "vcard", "contacts", "addressbook"]
 readme = "README.md"

Cargo.toml

@@ -112,9 +112,13 @@ pub fn edit_contact(config: &Configuration, query: &str) -> Result<()> {
     Ok(())
 }
 
-pub fn mutt_query<'a>(config: &Configuration, query: &str) -> Result<()> {
-    println!(""); // For some reason mutt requires an empty line
-                  // We need to ignore errors here, otherwise mutt's UI will glitch
+pub fn mutt_query(config: &Configuration, disable_first_line: bool, query: &str) -> Result<()> {
+    // For some reason mutt requires an empty line
+    // We need to ignore errors here, otherwise mutt's UI will glitch
+    if !disable_first_line {
+        println!();
+    }
+
     if let Ok(items) = utils::index_query(config, query) {
         for item in items {
             if item.email.len() > 0 && item.name.len() > 0 {
@@ -125,14 +129,14 @@ pub fn mutt_query<'a>(config: &Configuration, query: &str) -> Result<()> {
     Ok(())
 }
 
-pub fn file_query<'a>(config: &Configuration, query: &str) -> Result<()> {
+pub fn file_query(config: &Configuration, query: &str) -> Result<()> {
     for path in utils::file_query(config, query)?.iter() {
         println!("{}", path.display());
     }
     Ok(())
 }
 
-pub fn email_query<'a>(config: &Configuration, query: &str) -> Result<()> {
+pub fn email_query(config: &Configuration, query: &str) -> Result<()> {
     for item in utils::index_query(config, query)? {
         if item.name.len() > 0 && item.email.len() > 0 {
             println!("{} <{}>", item.name, item.email);

src/cli.rs

@@ -19,17 +19,18 @@ fn main() -> Result<()> {
         .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)),
+                .arg(Arg::with_name("disable-empty-line").long("disable-empty-line").help("Disable printing an empty first line"))
+                .arg(Arg::with_name("query").required(true)),
         )
         .subcommand(
             SubCommand::with_name("file-query")
                 .about("Search for contact, return just the filename.")
-                .arg(Arg::with_name("query").index(1)),
+                .arg(Arg::with_name("query").required(true)),
         )
         .subcommand(
             SubCommand::with_name("email-query")
                 .about("Search for contact, return \"name <email>\".")
-                .arg(Arg::with_name("query").index(1)),
+                .arg(Arg::with_name("query").required(true)),
         )
         .subcommand(
             SubCommand::with_name("add")
@@ -38,7 +39,7 @@ fn main() -> Result<()> {
         .subcommand(
             SubCommand::with_name("edit")
                 .about("Open contact (given by filepath or search-string) interactively.")
-                .arg(Arg::with_name("file-or-query").index(1)),
+                .arg(Arg::with_name("file-or-query").required(true)),
         )
         .get_matches();
 
@@ -50,25 +51,25 @@ fn main() -> Result<()> {
     };
 
     match app.subcommand() {
-        ("index", Some(_subs)) => {
+        ("index", Some(_args)) => {
             println!(
                 "Rebuilding index file \"{}\"...",
                 config.index_path.display()
             );
             cli::build_index(&config.index_path, &config.vdir_path)?;
         }
-        ("mutt-query", Some(subs)) => {
-            if let Some(value) = subs.value_of("query") {
-                cli::mutt_query(&config, value)?
+        ("mutt-query", Some(args)) => {
+            if let Some(value) = args.value_of("query") {
+                cli::mutt_query(&config, args.is_present("disable-empty-line"), value)?
             }
         }
-        ("file-query", Some(subs)) => {
-            if let Some(value) = subs.value_of("query") {
+        ("file-query", Some(args)) => {
+            if let Some(value) = args.value_of("query") {
                 cli::file_query(&config, value)?
             }
         }
-        ("email-query", Some(subs)) => {
-            if let Some(value) = subs.value_of("query") {
+        ("email-query", Some(args)) => {
+            if let Some(value) = args.value_of("query") {
                 cli::email_query(&config, value)?
             }
         }
@@ -87,8 +88,8 @@ fn main() -> Result<()> {
             let index_entry = utils::index_item_from_contact(&contact)?;
             index_fp.write_all(index_entry.as_bytes())?;
         }
-        ("edit", Some(subs)) => {
-            if let Some(value) = subs.value_of("file-or-query") {
+        ("edit", Some(args)) => {
+            if let Some(value) = args.value_of("file-or-query") {
                 cli::edit_contact(&config, value)?
             }
         }