This filters out duplicate addresses from address command output.
It also also adds tests for the address command.
The code here is an extended version of a patch from Jani Nikula.
---
doc/man1/notmuch-address.rst | 2 +-
notmuch-search.c | 40 ++++++++++++++++-
test/T095-address.sh | 100 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 140 insertions(+), 2 deletions(-)
create mode 100755 test/T095-address.sh
diff --git a/doc/man1/notmuch-address.rst b/doc/man1/notmuch-address.rst
index 8109f11..96512b7 100644
--- a/doc/man1/notmuch-address.rst
+++ b/doc/man1/notmuch-address.rst
@@ -11,7 +11,7 @@ DESCRIPTION
===========
Search for messages matching the given search terms, and display the
-addresses from them.
+addresses from them. Duplicate addresses are filtered out.
See **notmuch-search-terms(7)** for details of the supported syntax for
<search-terms>.
diff --git a/notmuch-search.c b/notmuch-search.c
index 4b9a372..c765017 100644
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -53,6 +53,7 @@ typedef struct {
int offset;
int limit;
int dupe;
+ GHashTable *addresses;
} search_context_t;
typedef struct {
@@ -240,6 +241,27 @@ do_search_threads (search_context_t *ctx)
return 0;
}
+/* Returns TRUE iff name and addr is duplicate. */
+static notmuch_bool_t
+is_duplicate (const search_context_t *ctx, const char *name, const char *addr)
+{
+ notmuch_bool_t duplicate;
+ char *key;
+
+ key = talloc_asprintf (ctx->format, "%s <%s>", name, addr);
+ if (! key)
+ return FALSE;
+
+ duplicate = g_hash_table_lookup_extended (ctx->addresses, key, NULL, NULL);
+
+ if (! duplicate)
+ g_hash_table_insert (ctx->addresses, key, NULL);
+ else
+ talloc_free (key);
+
+ return duplicate;
+}
+
static void
print_mailbox (const search_context_t *ctx, const mailbox_t *mailbox)
{
@@ -274,7 +296,8 @@ print_mailbox (const search_context_t *ctx, const mailbox_t
*mailbox)
/* Print addresses from InternetAddressList. */
static void
-process_address_list (const search_context_t *ctx, InternetAddressList *list)
+process_address_list (const search_context_t *ctx,
+ InternetAddressList *list)
{
InternetAddress *address;
int i;
@@ -298,6 +321,9 @@ process_address_list (const search_context_t *ctx,
InternetAddressList *list)
.addr = internet_address_mailbox_get_addr (mailbox),
};
+ if (is_duplicate (ctx, mbx.name, mbx.addr))
+ continue;
+
print_mailbox (ctx, &mbx);
}
}
@@ -321,6 +347,12 @@ process_address_header (const search_context_t *ctx, const
char *value)
g_object_unref (list);
}
+static void
+_my_talloc_free_for_g_hash (void *ptr)
+{
+ talloc_free (ptr);
+}
+
static int
do_search_messages (search_context_t *ctx)
{
@@ -642,8 +674,14 @@ notmuch_address_command (notmuch_config_t *config, int
argc, char *argv[])
argc - opt_index, argv + opt_index))
return EXIT_FAILURE;
+ ctx->addresses = g_hash_table_new_full (g_str_hash, g_str_equal,
+ _my_talloc_free_for_g_hash, NULL);
+
ret = do_search_messages (ctx);
+ g_hash_table_unref (ctx->addresses);
+
+
_notmuch_search_cleanup (ctx);
return ret ? EXIT_FAILURE : EXIT_SUCCESS;
diff --git a/test/T095-address.sh b/test/T095-address.sh
new file mode 100755
index 0000000..8a256d2
--- /dev/null
+++ b/test/T095-address.sh
@@ -0,0 +1,100 @@
+#!/usr/bin/env bash
+test_description='"notmuch address" in several variants'
+. ./test-lib.sh
+
+add_email_corpus
+
+test_begin_subtest "--output=sender"
+notmuch address --output=sender '*' >OUTPUT
+cat <<EOF >EXPECTED
+Fran?ois Boulogne <boulogne.f at gmail.com>
+Olivier Berger <olivier.berger at it-sudparis.eu>
+Chris Wilson <chris at chris-wilson.co.uk>
+Carl Worth <cworth at cworth.org>
+Alexander Botero-Lowry <alex.boterolowry at gmail.com>
+Keith Packard <keithp at keithp.com>
+Jjgod Jiang <gzjjgod at gmail.com>
+Rolland Santimano <rollandsantimano at yahoo.com>
+Jan Janak <jan at ryngle.com>
+Stewart Smith <stewart at flamingspork.com>
+Lars Kellogg-Stedman <lars at seas.harvard.edu>
+Alex Botero-Lowry <alex.boterolowry at gmail.com>
+Ingmar Vanhassel <ingmar at exherbo.org>
+Aron Griffis <agriffis at n01se.net>
+Adrian Perez de Castro <aperez at igalia.com>
+Israel Herraiz <isra at herraiz.org>
+Mikhail Gusarov <dottedmag at dottedmag.net>
+EOF
+test_expect_equal_file OUTPUT EXPECTED
+
+test_begin_subtest "--output=sender --format=json"
+notmuch address --output=sender --format=json '*' >OUTPUT
+cat <<EOF >EXPECTED
+[{"name": "Fran?ois Boulogne", "address": "boulogne.f at gmail.com",
"name-addr": "Fran?ois Boulogne <boulogne.f at gmail.com>"},
+{"name": "Olivier Berger", "address": "olivier.berger at it-sudparis.eu",
"name-addr": "Olivier Berger <olivier.berger at it-sudparis.eu>"},
+{"name": "Chris Wilson", "address": "chris at chris-wilson.co.uk",
"name-addr": "Chris Wilson <chris at chris-wilson.co.uk>"},
+{"name": "Carl Worth", "address": "cworth at cworth.org", "name-addr": "Carl
Worth <cworth at cworth.org>"},
+{"name": "Alexander Botero-Lowry", "address": "alex.boterolowry at gmail.com",
"name-addr": "Alexander Botero-Lowry <alex.boterolowry at gmail.com>"},
+{"name": "Keith Packard", "address": "keithp at keithp.com", "name-addr":
"Keith Packard <keithp at keithp.com>"},
+{"name": "Jjgod Jiang", "address": "gzjjgod at gmail.com", "name-addr": "Jjgod
Jiang <gzjjgod at gmail.com>"},
+{"name": "Rolland Santimano", "address": "rollandsantimano at yahoo.com",
"name-addr": "Rolland Santimano <rollandsantimano at yahoo.com>"},
+{"name": "Jan Janak", "address": "jan at ryngle.com", "name-addr": "Jan Janak
<jan at ryngle.com>"},
+{"name": "Stewart Smith", "address": "stewart at flamingspork.com",
"name-addr": "Stewart Smith <stewart at flamingspork.com>"},
+{"name": "Lars Kellogg-Stedman", "address": "lars at seas.harvard.edu",
"name-addr": "Lars Kellogg-Stedman <lars at seas.harvard.edu>"},
+{"name": "Alex Botero-Lowry", "address": "alex.boterolowry at gmail.com",
"name-addr": "Alex Botero-Lowry <alex.boterolowry at gmail.com>"},
+{"name": "Ingmar Vanhassel", "address": "ingmar at exherbo.org", "name-addr":
"Ingmar Vanhassel <ingmar at exherbo.org>"},
+{"name": "Aron Griffis", "address": "agriffis at n01se.net", "name-addr":
"Aron Griffis <agriffis at n01se.net>"},
+{"name": "Adrian Perez de Castro", "address": "aperez at igalia.com",
"name-addr": "Adrian Perez de Castro <aperez at igalia.com>"},
+{"name": "Israel Herraiz", "address": "isra at herraiz.org", "name-addr":
"Israel Herraiz <isra at herraiz.org>"},
+{"name": "Mikhail Gusarov", "address": "dottedmag at dottedmag.net",
"name-addr": "Mikhail Gusarov <dottedmag at dottedmag.net>"}]
+EOF
+test_expect_equal_file OUTPUT EXPECTED
+
+test_begin_subtest "--output=recipients"
+notmuch address --output=recipients '*' >OUTPUT
+cat <<EOF >EXPECTED
+Allan McRae <allan at archlinux.org>
+"Discussion about the Arch User Repository (AUR)" <aur-general at
archlinux.org>
+olivier.berger at it-sudparis.eu
+notmuch at notmuchmail.org
+notmuch <notmuch at notmuchmail.org>
+Keith Packard <keithp at keithp.com>
+Mikhail Gusarov <dottedmag at dottedmag.net>
+EOF
+test_expect_equal_file OUTPUT EXPECTED
+
+test_begin_subtest "--output=sender --output=recipients"
+notmuch address --output=sender --output=recipients '*' >OUTPUT
+cat <<EOF >EXPECTED
+Fran?ois Boulogne <boulogne.f at gmail.com>
+Allan McRae <allan at archlinux.org>
+"Discussion about the Arch User Repository (AUR)" <aur-general at
archlinux.org>
+Olivier Berger <olivier.berger at it-sudparis.eu>
+olivier.berger at it-sudparis.eu
+Chris Wilson <chris at chris-wilson.co.uk>
+notmuch at notmuchmail.org
+Carl Worth <cworth at cworth.org>
+Alexander Botero-Lowry <alex.boterolowry at gmail.com>
+Keith Packard <keithp at keithp.com>
+Jjgod Jiang <gzjjgod at gmail.com>
+Rolland Santimano <rollandsantimano at yahoo.com>
+Jan Janak <jan at ryngle.com>
+Stewart Smith <stewart at flamingspork.com>
+Lars Kellogg-Stedman <lars at seas.harvard.edu>
+notmuch <notmuch at notmuchmail.org>
+Alex Botero-Lowry <alex.boterolowry at gmail.com>
+Ingmar Vanhassel <ingmar at exherbo.org>
+Aron Griffis <agriffis at n01se.net>
+Adrian Perez de Castro <aperez at igalia.com>
+Israel Herraiz <isra at herraiz.org>
+Mikhail Gusarov <dottedmag at dottedmag.net>
+EOF
+test_expect_equal_file OUTPUT EXPECTED
+
+test_begin_subtest "No --output"
+notmuch address --output=sender --output=recipients '*' >OUTPUT
+# Use EXPECTED from previous subtest
+test_expect_equal_file OUTPUT EXPECTED
+
+
+test_done
--
2.1.1
