[PATCH v3 08/10] cli: address: Do not output duplicate addresses
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 | 42 ++-
test/T095-address.sh | 99
3 files changed, 141 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 d349237..01eb811 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
.
diff --git a/notmuch-search.c b/notmuch-search.c
index e084d25..86d54ba 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,28 @@ do_search_threads (search_context_t *ctx)
return 0;
}
+/* Returns TRUE iff name and addr is duplicate. If not, stores the
+ * name/addr pair in order to detect subsequent duplicates. */
+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 +297,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 +322,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 +348,13 @@ process_address_header (const search_context_t *ctx, const
char *value)
g_object_unref (list);
}
+/* Destructor for talloc-allocated GHashTable keys and values. */
+static void
+_talloc_free_for_g_hash (void *ptr)
+{
+talloc_free (ptr);
+}
+
static int
_count_filenames (notmuch_message_t *message)
{
@@ -673,8 +707,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,
+ _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 000..0d47c0d
--- /dev/null
+++ b/test/T095-address.sh
@@ -0,0 +1,99 @@
+#!/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 OUTPUT
+cat
[PATCH v3 08/10] cli: address: Do not output duplicate addresses
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 | 42 ++-
test/T095-address.sh | 99
3 files changed, 141 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 d349237..01eb811 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
.
diff --git a/notmuch-search.c b/notmuch-search.c
index e084d25..86d54ba 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,28 @@ do_search_threads (search_context_t *ctx)
return 0;
}
+/* Returns TRUE iff name and addr is duplicate. If not, stores the
+ * name/addr pair in order to detect subsequent duplicates. */
+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 +297,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 +322,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 +348,13 @@ process_address_header (const search_context_t *ctx, const
char *value)
g_object_unref (list);
}
+/* Destructor for talloc-allocated GHashTable keys and values. */
+static void
+_talloc_free_for_g_hash (void *ptr)
+{
+talloc_free (ptr);
+}
+
static int
_count_filenames (notmuch_message_t *message)
{
@@ -673,8 +707,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,
+ _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 000..0d47c0d
--- /dev/null
+++ b/test/T095-address.sh
@@ -0,0 +1,99 @@
+#!/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 OUTPUT
+cat
