[RFC Patch 3/3] CLI/address: source by frequency if output=count

[David Bremner <david@tethera.net>]

This is the other low hanging fruit, because we already require a
second pass of the hashed values to output.
---
 notmuch-search.c     | 10 ++++++----
 test/T095-address.sh | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/notmuch-search.c b/notmuch-search.c
index ff3967fd..9f698a09 100644
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -522,8 +522,11 @@ process_hash_value (unused (void *key), void *list, void *context)
     if (ctx->dedup == DEDUP_ADDRESS) {
 	mailbox_t *mailbox = summarize_mailboxes (list);
 	ctx->output_mailboxes = g_list_prepend (ctx->output_mailboxes, mailbox);
-    } else
-	g_list_foreach (list, print_list_value, context);
+    } else {
+	for (GList *l = list; l; l = l->next) {
+	    ctx->output_mailboxes = g_list_prepend (ctx->output_mailboxes, l->data);
+	}
+    }
 }
 
 static int
@@ -630,8 +633,7 @@ do_search_messages (search_context_t *ctx)
 	(ctx->output & OUTPUT_COUNT || ctx->dedup == DEDUP_ADDRESS)) {
 	g_hash_table_foreach (ctx->addresses, process_hash_value, ctx);
 	ctx->output_mailboxes = g_list_sort (ctx->output_mailboxes, compare_count);
-	if (ctx->dedup == DEDUP_ADDRESS)
-	    g_list_foreach (ctx->output_mailboxes, print_list_value, ctx);
+	g_list_foreach (ctx->output_mailboxes, print_list_value, ctx);
     }
     notmuch_messages_destroy (messages);
 
diff --git a/test/T095-address.sh b/test/T095-address.sh
index 53886591..204168c7 100755
--- a/test/T095-address.sh
+++ b/test/T095-address.sh
@@ -119,6 +119,14 @@ cat <<EOF >EXPECTED
 EOF
 test_expect_equal_file EXPECTED OUTPUT
 
+test_begin_subtest "--output=sender --output=count (sort by frequency)"
+notmuch address --output=sender --output=count '*' | head -n 2 >OUTPUT
+cat <<EOF >EXPECTED
+12	Carl Worth <cworth@cworth.org>
+7	Keith Packard <keithp@keithp.com>
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
 test_begin_subtest "--output=recipients --output=address"
 notmuch address --output=recipients --output=address '*' >OUTPUT
 cat <<EOF >EXPECTED
@@ -155,6 +163,14 @@ cat <<EOF >EXPECTED
 EOF
 test_expect_equal_file EXPECTED OUTPUT
 
+test_begin_subtest "--output=sender --output=address --output=count (sort by frequency)"
+notmuch address --output=sender --output=address --output=count '*' | head -n 2 >OUTPUT
+cat <<EOF >EXPECTED
+12	cworth@cworth.org
+7	keithp@keithp.com
+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.
@@ -181,6 +197,15 @@ cat <<EOF >EXPECTED
 EOF
 test_expect_equal_file EXPECTED OUTPUT
 
+test_begin_subtest "--output=count --format=json (sort by frequency)"
+notmuch address --output=count --format=json '*' | \
+    sed -e 's/^\[//' -e 's/]$//' -e 's/,$//' | head -n 2 >OUTPUT
+cat <<EOF >EXPECTED
+{"name": "Carl Worth", "address": "cworth@cworth.org", "name-addr": "Carl Worth <cworth@cworth.org>", "count": 12}
+{"name": "Keith Packard", "address": "keithp@keithp.com", "name-addr": "Keith Packard <keithp@keithp.com>", "count": 7}
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
 test_begin_subtest "--deduplicate=no --sort=oldest-first --output=sender"
 notmuch address --deduplicate=no --sort=oldest-first --output=sender '*' >OUTPUT
 cat <<EOF >EXPECTED
@@ -337,6 +362,15 @@ cat <<EOF >EXPECTED
 EOF
 test_expect_equal_file EXPECTED OUTPUT
 
+test_begin_subtest "--deduplicate=mailbox --output=sender --output=count (sort by frequency)"
+notmuch address --deduplicate=mailbox --output=sender --output=count from:example.com  | head -n 3 | sort -k2 >OUTPUT
+cat <<EOF >EXPECTED
+2	Baz <foo.bar+baz@example.com>
+2	Foo Bar <foo.bar@example.com>
+2	foo.bar@example.com
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
 test_begin_subtest "--deduplicate=address --output=sender --output=count"
 notmuch address --deduplicate=address --output=sender --output=count from:example.com | sort -n >OUTPUT
 cat <<EOF >EXPECTED
-- 
2.34.1