--- /dev/null
+Return-Path: <sojkam1@fel.cvut.cz>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 30F7E431FAF\r
+ for <notmuch@notmuchmail.org>; Sat, 1 Nov 2014 17:50:27 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 2aIDNVQnScby for <notmuch@notmuchmail.org>;\r
+ Sat, 1 Nov 2014 17:50:18 -0700 (PDT)\r
+Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36])\r
+ by olra.theworths.org (Postfix) with ESMTP id E652D431FDC\r
+ for <notmuch@notmuchmail.org>; Sat, 1 Nov 2014 17:50:13 -0700 (PDT)\r
+Received: from localhost (unknown [192.168.200.7])\r
+ by max.feld.cvut.cz (Postfix) with ESMTP id 977725CD28B\r
+ for <notmuch@notmuchmail.org>; Sun, 2 Nov 2014 01:50:13 +0100 (CET)\r
+X-Virus-Scanned: IMAP STYX AMAVIS\r
+Received: from max.feld.cvut.cz ([192.168.200.1])\r
+ by localhost (styx.feld.cvut.cz [192.168.200.7]) (amavisd-new,\r
+ port 10044) with ESMTP id KTUChTzKxDGu for <notmuch@notmuchmail.org>;\r
+ Sun, 2 Nov 2014 01:50:10 +0100 (CET)\r
+Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34])\r
+ by max.feld.cvut.cz (Postfix) with ESMTP id DBE5F5CD291\r
+ for <notmuch@notmuchmail.org>; Sun, 2 Nov 2014 01:50:06 +0100 (CET)\r
+Received: from wsh by steelpick.2x.cz with local (Exim 4.84)\r
+ (envelope-from <sojkam1@fel.cvut.cz>)\r
+ id 1XkjMq-00085L-JZ; Sun, 02 Nov 2014 01:50:04 +0100\r
+From: Michal Sojka <sojkam1@fel.cvut.cz>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 08/10] cli: address: Do not output duplicate addresses\r
+Date: Sun, 2 Nov 2014 01:49:58 +0100\r
+Message-Id: <1414889400-30977-9-git-send-email-sojkam1@fel.cvut.cz>\r
+X-Mailer: git-send-email 2.1.1\r
+In-Reply-To: <1414889400-30977-1-git-send-email-sojkam1@fel.cvut.cz>\r
+References: <1414889400-30977-1-git-send-email-sojkam1@fel.cvut.cz>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: 8bit\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 02 Nov 2014 00:50:27 -0000\r
+\r
+This filters out duplicate addresses from address command output.\r
+\r
+It also also adds tests for the address command.\r
+\r
+The code here is an extended version of a patch from Jani Nikula.\r
+---\r
+ doc/man1/notmuch-address.rst | 2 +-\r
+ notmuch-search.c | 40 ++++++++++++++++-\r
+ test/T095-address.sh | 100 +++++++++++++++++++++++++++++++++++++++++++\r
+ 3 files changed, 140 insertions(+), 2 deletions(-)\r
+ create mode 100755 test/T095-address.sh\r
+\r
+diff --git a/doc/man1/notmuch-address.rst b/doc/man1/notmuch-address.rst\r
+index 8109f11..96512b7 100644\r
+--- a/doc/man1/notmuch-address.rst\r
++++ b/doc/man1/notmuch-address.rst\r
+@@ -11,7 +11,7 @@ DESCRIPTION\r
+ ===========\r
+ \r
+ Search for messages matching the given search terms, and display the\r
+-addresses from them.\r
++addresses from them. Duplicate addresses are filtered out.\r
+ \r
+ See **notmuch-search-terms(7)** for details of the supported syntax for\r
+ <search-terms>.\r
+diff --git a/notmuch-search.c b/notmuch-search.c\r
+index 4b9a372..c765017 100644\r
+--- a/notmuch-search.c\r
++++ b/notmuch-search.c\r
+@@ -53,6 +53,7 @@ typedef struct {\r
+ int offset;\r
+ int limit;\r
+ int dupe;\r
++ GHashTable *addresses;\r
+ } search_context_t;\r
+ \r
+ typedef struct {\r
+@@ -240,6 +241,27 @@ do_search_threads (search_context_t *ctx)\r
+ return 0;\r
+ }\r
+ \r
++/* Returns TRUE iff name and addr is duplicate. */\r
++static notmuch_bool_t\r
++is_duplicate (const search_context_t *ctx, const char *name, const char *addr)\r
++{\r
++ notmuch_bool_t duplicate;\r
++ char *key;\r
++\r
++ key = talloc_asprintf (ctx->format, "%s <%s>", name, addr);\r
++ if (! key)\r
++ return FALSE;\r
++\r
++ duplicate = g_hash_table_lookup_extended (ctx->addresses, key, NULL, NULL);\r
++\r
++ if (! duplicate)\r
++ g_hash_table_insert (ctx->addresses, key, NULL);\r
++ else\r
++ talloc_free (key);\r
++\r
++ return duplicate;\r
++}\r
++\r
+ static void\r
+ print_mailbox (const search_context_t *ctx, const mailbox_t *mailbox)\r
+ {\r
+@@ -274,7 +296,8 @@ print_mailbox (const search_context_t *ctx, const mailbox_t *mailbox)\r
+ \r
+ /* Print addresses from InternetAddressList. */\r
+ static void\r
+-process_address_list (const search_context_t *ctx, InternetAddressList *list)\r
++process_address_list (const search_context_t *ctx,\r
++ InternetAddressList *list)\r
+ {\r
+ InternetAddress *address;\r
+ int i;\r
+@@ -298,6 +321,9 @@ process_address_list (const search_context_t *ctx, InternetAddressList *list)\r
+ .addr = internet_address_mailbox_get_addr (mailbox),\r
+ };\r
+ \r
++ if (is_duplicate (ctx, mbx.name, mbx.addr))\r
++ continue;\r
++\r
+ print_mailbox (ctx, &mbx);\r
+ }\r
+ }\r
+@@ -321,6 +347,12 @@ process_address_header (const search_context_t *ctx, const char *value)\r
+ g_object_unref (list);\r
+ }\r
+ \r
++static void\r
++_my_talloc_free_for_g_hash (void *ptr)\r
++{\r
++ talloc_free (ptr);\r
++}\r
++\r
+ static int\r
+ do_search_messages (search_context_t *ctx)\r
+ {\r
+@@ -642,8 +674,14 @@ notmuch_address_command (notmuch_config_t *config, int argc, char *argv[])\r
+ argc - opt_index, argv + opt_index))\r
+ return EXIT_FAILURE;\r
+ \r
++ ctx->addresses = g_hash_table_new_full (g_str_hash, g_str_equal,\r
++ _my_talloc_free_for_g_hash, NULL);\r
++\r
+ ret = do_search_messages (ctx);\r
+ \r
++ g_hash_table_unref (ctx->addresses);\r
++\r
++\r
+ _notmuch_search_cleanup (ctx);\r
+ \r
+ return ret ? EXIT_FAILURE : EXIT_SUCCESS;\r
+diff --git a/test/T095-address.sh b/test/T095-address.sh\r
+new file mode 100755\r
+index 0000000..8a256d2\r
+--- /dev/null\r
++++ b/test/T095-address.sh\r
+@@ -0,0 +1,100 @@\r
++#!/usr/bin/env bash\r
++test_description='"notmuch address" in several variants'\r
++. ./test-lib.sh\r
++\r
++add_email_corpus\r
++\r
++test_begin_subtest "--output=sender"\r
++notmuch address --output=sender '*' >OUTPUT\r
++cat <<EOF >EXPECTED\r
++François Boulogne <boulogne.f@gmail.com>\r
++Olivier Berger <olivier.berger@it-sudparis.eu>\r
++Chris Wilson <chris@chris-wilson.co.uk>\r
++Carl Worth <cworth@cworth.org>\r
++Alexander Botero-Lowry <alex.boterolowry@gmail.com>\r
++Keith Packard <keithp@keithp.com>\r
++Jjgod Jiang <gzjjgod@gmail.com>\r
++Rolland Santimano <rollandsantimano@yahoo.com>\r
++Jan Janak <jan@ryngle.com>\r
++Stewart Smith <stewart@flamingspork.com>\r
++Lars Kellogg-Stedman <lars@seas.harvard.edu>\r
++Alex Botero-Lowry <alex.boterolowry@gmail.com>\r
++Ingmar Vanhassel <ingmar@exherbo.org>\r
++Aron Griffis <agriffis@n01se.net>\r
++Adrian Perez de Castro <aperez@igalia.com>\r
++Israel Herraiz <isra@herraiz.org>\r
++Mikhail Gusarov <dottedmag@dottedmag.net>\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++test_begin_subtest "--output=sender --format=json"\r
++notmuch address --output=sender --format=json '*' >OUTPUT\r
++cat <<EOF >EXPECTED\r
++[{"name": "François Boulogne", "address": "boulogne.f@gmail.com", "name-addr": "François Boulogne <boulogne.f@gmail.com>"},\r
++{"name": "Olivier Berger", "address": "olivier.berger@it-sudparis.eu", "name-addr": "Olivier Berger <olivier.berger@it-sudparis.eu>"},\r
++{"name": "Chris Wilson", "address": "chris@chris-wilson.co.uk", "name-addr": "Chris Wilson <chris@chris-wilson.co.uk>"},\r
++{"name": "Carl Worth", "address": "cworth@cworth.org", "name-addr": "Carl Worth <cworth@cworth.org>"},\r
++{"name": "Alexander Botero-Lowry", "address": "alex.boterolowry@gmail.com", "name-addr": "Alexander Botero-Lowry <alex.boterolowry@gmail.com>"},\r
++{"name": "Keith Packard", "address": "keithp@keithp.com", "name-addr": "Keith Packard <keithp@keithp.com>"},\r
++{"name": "Jjgod Jiang", "address": "gzjjgod@gmail.com", "name-addr": "Jjgod Jiang <gzjjgod@gmail.com>"},\r
++{"name": "Rolland Santimano", "address": "rollandsantimano@yahoo.com", "name-addr": "Rolland Santimano <rollandsantimano@yahoo.com>"},\r
++{"name": "Jan Janak", "address": "jan@ryngle.com", "name-addr": "Jan Janak <jan@ryngle.com>"},\r
++{"name": "Stewart Smith", "address": "stewart@flamingspork.com", "name-addr": "Stewart Smith <stewart@flamingspork.com>"},\r
++{"name": "Lars Kellogg-Stedman", "address": "lars@seas.harvard.edu", "name-addr": "Lars Kellogg-Stedman <lars@seas.harvard.edu>"},\r
++{"name": "Alex Botero-Lowry", "address": "alex.boterolowry@gmail.com", "name-addr": "Alex Botero-Lowry <alex.boterolowry@gmail.com>"},\r
++{"name": "Ingmar Vanhassel", "address": "ingmar@exherbo.org", "name-addr": "Ingmar Vanhassel <ingmar@exherbo.org>"},\r
++{"name": "Aron Griffis", "address": "agriffis@n01se.net", "name-addr": "Aron Griffis <agriffis@n01se.net>"},\r
++{"name": "Adrian Perez de Castro", "address": "aperez@igalia.com", "name-addr": "Adrian Perez de Castro <aperez@igalia.com>"},\r
++{"name": "Israel Herraiz", "address": "isra@herraiz.org", "name-addr": "Israel Herraiz <isra@herraiz.org>"},\r
++{"name": "Mikhail Gusarov", "address": "dottedmag@dottedmag.net", "name-addr": "Mikhail Gusarov <dottedmag@dottedmag.net>"}]\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++test_begin_subtest "--output=recipients"\r
++notmuch address --output=recipients '*' >OUTPUT\r
++cat <<EOF >EXPECTED\r
++Allan McRae <allan@archlinux.org>\r
++"Discussion about the Arch User Repository (AUR)" <aur-general@archlinux.org>\r
++olivier.berger@it-sudparis.eu\r
++notmuch@notmuchmail.org\r
++notmuch <notmuch@notmuchmail.org>\r
++Keith Packard <keithp@keithp.com>\r
++Mikhail Gusarov <dottedmag@dottedmag.net>\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++test_begin_subtest "--output=sender --output=recipients"\r
++notmuch address --output=sender --output=recipients '*' >OUTPUT\r
++cat <<EOF >EXPECTED\r
++François Boulogne <boulogne.f@gmail.com>\r
++Allan McRae <allan@archlinux.org>\r
++"Discussion about the Arch User Repository (AUR)" <aur-general@archlinux.org>\r
++Olivier Berger <olivier.berger@it-sudparis.eu>\r
++olivier.berger@it-sudparis.eu\r
++Chris Wilson <chris@chris-wilson.co.uk>\r
++notmuch@notmuchmail.org\r
++Carl Worth <cworth@cworth.org>\r
++Alexander Botero-Lowry <alex.boterolowry@gmail.com>\r
++Keith Packard <keithp@keithp.com>\r
++Jjgod Jiang <gzjjgod@gmail.com>\r
++Rolland Santimano <rollandsantimano@yahoo.com>\r
++Jan Janak <jan@ryngle.com>\r
++Stewart Smith <stewart@flamingspork.com>\r
++Lars Kellogg-Stedman <lars@seas.harvard.edu>\r
++notmuch <notmuch@notmuchmail.org>\r
++Alex Botero-Lowry <alex.boterolowry@gmail.com>\r
++Ingmar Vanhassel <ingmar@exherbo.org>\r
++Aron Griffis <agriffis@n01se.net>\r
++Adrian Perez de Castro <aperez@igalia.com>\r
++Israel Herraiz <isra@herraiz.org>\r
++Mikhail Gusarov <dottedmag@dottedmag.net>\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++test_begin_subtest "No --output"\r
++notmuch address --output=sender --output=recipients '*' >OUTPUT\r
++# Use EXPECTED from previous subtest\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++\r
++test_done\r
+-- \r
+2.1.1\r
+\r
projects / notmuch-archives.git / commitdiff