[PATCH] cli: add support for only printing the addresses in notmuch address

classic Classic list List threaded Threaded
1 message Options
Jani Nikula Jani Nikula
Reply | Threaded
Open this post in threaded view
|

[PATCH] cli: add support for only printing the addresses in notmuch address

The notmuch address output is much more useful for scripts with just
the addresses printed. Support this using the --output=address option.
---
 completion/notmuch-completion.bash |  2 +-
 doc/man1/notmuch-address.rst       |  7 ++++++-
 notmuch-search.c                   |  7 ++++++-
 test/T095-address.sh               | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index 7aae4297ae0e..4e94275e3193 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -468,7 +468,7 @@ _notmuch_address()
     return
     ;;
  --output)
-    COMPREPLY=( $( compgen -W "sender recipients count" -- "${cur}" ) )
+    COMPREPLY=( $( compgen -W "sender recipients count address" -- "${cur}" ) )
     return
     ;;
  --sort)
diff --git a/doc/man1/notmuch-address.rst b/doc/man1/notmuch-address.rst
index dbac20f7b012..68415d13c5b6 100644
--- a/doc/man1/notmuch-address.rst
+++ b/doc/man1/notmuch-address.rst
@@ -29,7 +29,7 @@ Supported options for **address** include
         intended for programs that invoke **notmuch(1)** internally. If
         omitted, the latest supported version will be used.
 
-    ``--output=(sender|recipients|count)``
+    ``--output=(sender|recipients|count|address)``
 
         Controls which information appears in the output. This option
         can be given multiple times to combine different outputs.
@@ -55,6 +55,11 @@ Supported options for **address** include
             Note: With this option, addresses are printed only after
             the whole search is finished. This may take long time.
 
+        **address**
+            Output only the email addresses instead of the full
+            mailboxes with names and email addresses. This option has
+            no effect on the JSON or S-Expression output formats.
+
     ``--deduplicate=(no|mailbox|address)``
 
         Control the deduplication of results.
diff --git a/notmuch-search.c b/notmuch-search.c
index 0abac08eb7ab..8f467db43cf0 100644
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -34,6 +34,7 @@ typedef enum {
     OUTPUT_SENDER = 1 << 5,
     OUTPUT_RECIPIENTS = 1 << 6,
     OUTPUT_COUNT = 1 << 7,
+    OUTPUT_ADDRESS = 1 << 8,
 } output_t;
 
 typedef enum {
@@ -370,7 +371,10 @@ print_mailbox (const search_context_t *ctx, const mailbox_t *mailbox)
     format->integer (format, count);
     format->string (format, "\t");
  }
- format->string (format, name_addr);
+ if (ctx->output & OUTPUT_ADDRESS)
+    format->string (format, addr);
+ else
+    format->string (format, name_addr);
  format->separator (format);
     } else {
  format->begin_map (format);
@@ -877,6 +881,7 @@ notmuch_address_command (notmuch_config_t *config, int argc, char *argv[])
   (notmuch_keyword_t []){ { "sender", OUTPUT_SENDER },
   { "recipients", OUTPUT_RECIPIENTS },
   { "count", OUTPUT_COUNT },
+  { "address", OUTPUT_ADDRESS },
   { 0, 0 } } },
  { .opt_keyword = &ctx->exclude, .name = "exclude", .keywords =
   (notmuch_keyword_t []){ { "true", NOTMUCH_EXCLUDE_TRUE },
diff --git a/test/T095-address.sh b/test/T095-address.sh
index f0291d29ec43..817be5380a45 100755
--- a/test/T095-address.sh
+++ b/test/T095-address.sh
@@ -119,6 +119,42 @@ cat <<EOF >EXPECTED
 EOF
 test_expect_equal_file EXPECTED OUTPUT
 
+test_begin_subtest "--output=recipients --output=address"
+notmuch address --output=recipients --output=address '*' >OUTPUT
+cat <<EOF >EXPECTED
+[hidden email]
+[hidden email]
+[hidden email]
+[hidden email]
+[hidden email]
+[hidden email]
+[hidden email]
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
+test_begin_subtest "--output=sender --output=address --output=count"
+notmuch address --output=sender --output=address --output=count '*' | sort -n >OUTPUT
+cat <<EOF >EXPECTED
+1 [hidden email]
+1 [hidden email]
+1 [hidden email]
+1 [hidden email]
+1 [hidden email]
+1 [hidden email]
+1 [hidden email]
+1 [hidden email]
+2 [hidden email]
+2 [hidden email]
+3 [hidden email]
+4 [hidden email]
+4 [hidden email]
+5 [hidden email]
+5 [hidden email]
+7 [hidden email]
+12 [hidden email]
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
 test_begin_subtest "--output=count --format=json"
 # Since the iteration order of GHashTable is not specified, we
 # preprocess and sort the results to keep the order stable here.
--
2.11.0

_______________________________________________
notmuch mailing list
[hidden email]
https://notmuchmail.org/mailman/listinfo/notmuch