[PATCH v5 5/7] cli: search: Do not output duplicate addresses
Michal Sojka
sojkam1 at fel.cvut.cz
Thu Oct 30 16:59:31 PDT 2014
This filters out duplicate addresses from address outputs (sender,
receivers).
It also also adds tests for the new outputs.
The code here is an extended version of a patch from Jani Nikula.
---
doc/man1/notmuch-search.rst | 2 ++
notmuch-search.c | 51 ++++++++++++++++++++++----
test/T090-search-output.sh | 87 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 134 insertions(+), 6 deletions(-)
diff --git a/doc/man1/notmuch-search.rst b/doc/man1/notmuch-search.rst
index b6607c9..42f17e4 100644
--- a/doc/man1/notmuch-search.rst
+++ b/doc/man1/notmuch-search.rst
@@ -85,6 +85,8 @@ Supported options for **search** include
(--format=text0), as a JSON array (--format=json), or as
an S-Expression list (--format=sexp).
+ Duplicate addresses are filtered out.
+
Note: Searching for **sender** should be much faster than
searching for **recipients**, because sender addresses are
cached directly in the database whereas other addresses
diff --git a/notmuch-search.c b/notmuch-search.c
index 31e4221..eae749a 100644
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -229,6 +229,27 @@ do_search_threads (search_options_t *opt)
return 0;
}
+/* Returns TRUE iff name and addr is duplicate. */
+static notmuch_bool_t
+is_duplicate (const search_options_t *opt, GHashTable *addrs, const char *name, const char *addr)
+{
+ notmuch_bool_t duplicate;
+ char *key;
+
+ key = talloc_asprintf (opt->format, "%s <%s>", name, addr);
+ if (! key)
+ return FALSE;
+
+ duplicate = g_hash_table_lookup_extended (addrs, key, NULL, NULL);
+
+ if (! duplicate)
+ g_hash_table_insert (addrs, key, NULL);
+ else
+ talloc_free (key);
+
+ return duplicate;
+}
+
static void
print_mailbox (const search_options_t *opt, const mailbox_t *mailbox)
{
@@ -265,7 +286,8 @@ print_mailbox (const search_options_t *opt, const mailbox_t *mailbox)
/* Print addresses from InternetAddressList. */
static void
-process_address_list (const search_options_t *opt, InternetAddressList *list)
+process_address_list (const search_options_t *opt, GHashTable *addrs,
+ InternetAddressList *list)
{
InternetAddress *address;
int i;
@@ -281,7 +303,7 @@ process_address_list (const search_options_t *opt, InternetAddressList *list)
if (group_list == NULL)
continue;
- process_address_list (opt, group_list);
+ process_address_list (opt, addrs, group_list);
} else {
InternetAddressMailbox *mailbox = INTERNET_ADDRESS_MAILBOX (address);
mailbox_t mbx = {
@@ -289,6 +311,9 @@ process_address_list (const search_options_t *opt, InternetAddressList *list)
.addr = internet_address_mailbox_get_addr (mailbox),
};
+ if (is_duplicate (opt, addrs, mbx.name, mbx.addr))
+ continue;
+
print_mailbox (opt, &mbx);
}
}
@@ -296,7 +321,7 @@ process_address_list (const search_options_t *opt, InternetAddressList *list)
/* Print addresses from a message header. */
static void
-process_address_header (const search_options_t *opt, const char *value)
+process_address_header (const search_options_t *opt, GHashTable *addrs, const char *value)
{
InternetAddressList *list;
@@ -307,7 +332,13 @@ process_address_header (const search_options_t *opt, const char *value)
if (list == NULL)
return;
- process_address_list (opt, list);
+ process_address_list (opt, addrs, list);
+}
+
+static void
+_my_talloc_free_for_g_hash (void *ptr)
+{
+ talloc_free (ptr);
}
static int
@@ -317,8 +348,13 @@ do_search_messages (search_options_t *opt)
notmuch_messages_t *messages;
notmuch_filenames_t *filenames;
sprinter_t *format = opt->format;
+ GHashTable *addresses = NULL;
int i;
+ if (opt->output & OUTPUT_ADDRESS_FLAGS)
+ addresses = g_hash_table_new_full (g_str_hash, g_str_equal,
+ _my_talloc_free_for_g_hash, NULL);
+
if (opt->offset < 0) {
opt->offset += notmuch_query_count_messages (opt->query);
if (opt->offset < 0)
@@ -366,7 +402,7 @@ do_search_messages (search_options_t *opt)
const char *addrs;
addrs = notmuch_message_get_header (message, "from");
- process_address_header (opt, addrs);
+ process_address_header (opt, addresses, addrs);
}
if (opt->output & OUTPUT_RECIPIENTS) {
@@ -376,7 +412,7 @@ do_search_messages (search_options_t *opt)
for (j = 0; j < ARRAY_SIZE (hdrs); j++) {
addrs = notmuch_message_get_header (message, hdrs[j]);
- process_address_header (opt, addrs);
+ process_address_header (opt, addresses, addrs);
}
}
}
@@ -384,6 +420,9 @@ do_search_messages (search_options_t *opt)
notmuch_message_destroy (message);
}
+ if (addresses)
+ g_hash_table_unref (addresses);
+
notmuch_messages_destroy (messages);
format->end (format);
diff --git a/test/T090-search-output.sh b/test/T090-search-output.sh
index 947d572..841a721 100755
--- a/test/T090-search-output.sh
+++ b/test/T090-search-output.sh
@@ -387,6 +387,93 @@ cat <<EOF >EXPECTED
EOF
test_expect_equal_file OUTPUT EXPECTED
+test_begin_subtest "--output=sender"
+notmuch search --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 search --output=sender --format=json '*' >OUTPUT
+cat <<EOF >EXPECTED
+[{"name": "François Boulogne", "address": "boulogne.f at gmail.com"},
+{"name": "Olivier Berger", "address": "olivier.berger at it-sudparis.eu"},
+{"name": "Chris Wilson", "address": "chris at chris-wilson.co.uk"},
+{"name": "Carl Worth", "address": "cworth at cworth.org"},
+{"name": "Alexander Botero-Lowry", "address": "alex.boterolowry at gmail.com"},
+{"name": "Keith Packard", "address": "keithp at keithp.com"},
+{"name": "Jjgod Jiang", "address": "gzjjgod at gmail.com"},
+{"name": "Rolland Santimano", "address": "rollandsantimano at yahoo.com"},
+{"name": "Jan Janak", "address": "jan at ryngle.com"},
+{"name": "Stewart Smith", "address": "stewart at flamingspork.com"},
+{"name": "Lars Kellogg-Stedman", "address": "lars at seas.harvard.edu"},
+{"name": "Alex Botero-Lowry", "address": "alex.boterolowry at gmail.com"},
+{"name": "Ingmar Vanhassel", "address": "ingmar at exherbo.org"},
+{"name": "Aron Griffis", "address": "agriffis at n01se.net"},
+{"name": "Adrian Perez de Castro", "address": "aperez at igalia.com"},
+{"name": "Israel Herraiz", "address": "isra at herraiz.org"},
+{"name": "Mikhail Gusarov", "address": "dottedmag at dottedmag.net"}]
+EOF
+test_expect_equal_file OUTPUT EXPECTED
+
+test_begin_subtest "--output=recipients"
+notmuch search --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 search --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 "sanitize output for quoted-printable line-breaks in author and subject"
add_message "[subject]='two =?ISO-8859-1?Q?line=0A_subject?=
headers'"
--
2.1.1
More information about the notmuch
mailing list