--- /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 0FC08429E25\r
+ for <notmuch@notmuchmail.org>; Mon, 27 Oct 2014 07:51: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 4iANC6I8aJqI for <notmuch@notmuchmail.org>;\r
+ Mon, 27 Oct 2014 07:51:19 -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 8DB89431FDB\r
+ for <notmuch@notmuchmail.org>; Mon, 27 Oct 2014 07:51:14 -0700 (PDT)\r
+Received: from localhost (unknown [192.168.200.7])\r
+ by max.feld.cvut.cz (Postfix) with ESMTP id 0683A5CCF9D\r
+ for <notmuch@notmuchmail.org>; Mon, 27 Oct 2014 15:51:12 +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 6W_eysLIWzpe for <notmuch@notmuchmail.org>;\r
+ Mon, 27 Oct 2014 15:51:08 +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 9A4A35CCF92\r
+ for <notmuch@notmuchmail.org>; Mon, 27 Oct 2014 15:51:07 +0100 (CET)\r
+Received: from wsh by steelpick.2x.cz with local (Exim 4.84)\r
+ (envelope-from <sojkam1@fel.cvut.cz>)\r
+ id 1XildT-0000os-JS; Mon, 27 Oct 2014 15:51:07 +0100\r
+From: Michal Sojka <sojkam1@fel.cvut.cz>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 5/6] cli: search: Add configurable way to filter out\r
+ duplicate addresses\r
+Date: Mon, 27 Oct 2014 15:50:54 +0100\r
+Message-Id: <1414421455-3037-6-git-send-email-sojkam1@fel.cvut.cz>\r
+X-Mailer: git-send-email 2.1.1\r
+In-Reply-To: <1414421455-3037-1-git-send-email-sojkam1@fel.cvut.cz>\r
+References: <1414421455-3037-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: Mon, 27 Oct 2014 14:51:27 -0000\r
+\r
+This adds an algorithm to filter out duplicate addresses from address\r
+outputs (sender, receivers). The algorithm can be configured with\r
+--filter-by command line option.\r
+\r
+The code here is an extended version of a patch from Jani Nikula.\r
+---\r
+ completion/notmuch-completion.bash | 6 ++-\r
+ completion/notmuch-completion.zsh | 3 +-\r
+ doc/man1/notmuch-search.rst | 38 +++++++++++++++\r
+ notmuch-search.c | 98 +++++++++++++++++++++++++++++++++++---\r
+ test/T090-search-output.sh | 87 +++++++++++++++++++++++++++++++++\r
+ test/T095-search-filter-by.sh | 64 +++++++++++++++++++++++++\r
+ 6 files changed, 288 insertions(+), 8 deletions(-)\r
+ create mode 100755 test/T095-search-filter-by.sh\r
+\r
+diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash\r
+index cfbd389..6b6d43a 100644\r
+--- a/completion/notmuch-completion.bash\r
++++ b/completion/notmuch-completion.bash\r
+@@ -305,12 +305,16 @@ _notmuch_search()\r
+ COMPREPLY=( $( compgen -W "true false flag all" -- "${cur}" ) )\r
+ return\r
+ ;;\r
++ --filter-by)\r
++ COMPREPLY=( $( compgen -W "nameaddr name addr addrfold nameaddrfold" -- "${cur}" ) )\r
++ return\r
++ ;;\r
+ esac\r
+ \r
+ ! $split &&\r
+ case "${cur}" in\r
+ -*)\r
+- local options="--format= --output= --sort= --offset= --limit= --exclude= --duplicate="\r
++ local options="--format= --output= --sort= --offset= --limit= --exclude= --duplicate= --filter-by="\r
+ compopt -o nospace\r
+ COMPREPLY=( $(compgen -W "$options" -- ${cur}) )\r
+ ;;\r
+diff --git a/completion/notmuch-completion.zsh b/completion/notmuch-completion.zsh\r
+index 3e52a00..3e535df 100644\r
+--- a/completion/notmuch-completion.zsh\r
++++ b/completion/notmuch-completion.zsh\r
+@@ -53,7 +53,8 @@ _notmuch_search()\r
+ '--max-threads=[display only the first x threads from the search results]:number of threads to show: ' \\r
+ '--first=[omit the first x threads from the search results]:number of threads to omit: ' \\r
+ '--sort=[sort results]:sorting:((newest-first\:"reverse chronological order" oldest-first\:"chronological order"))' \\r
+- '--output=[select what to output]:output:((summary threads messages files tags sender recipients))'\r
++ '--output=[select what to output]:output:((summary threads messages files tags sender recipients))' \\r
++ '--filter-by=[filter out duplicate addresses]:filter-by:((nameaddr\:"both name and address part" name\:"name part" addr\:"address part" addrfold\:"case-insensitive address part" nameaddrfold\:"name and case-insensitive address part"))'\r
+ }\r
+ \r
+ _notmuch()\r
+diff --git a/doc/man1/notmuch-search.rst b/doc/man1/notmuch-search.rst\r
+index b6607c9..84af2da 100644\r
+--- a/doc/man1/notmuch-search.rst\r
++++ b/doc/man1/notmuch-search.rst\r
+@@ -85,6 +85,9 @@ Supported options for **search** include\r
+ (--format=text0), as a JSON array (--format=json), or as\r
+ an S-Expression list (--format=sexp).\r
+ \r
++ Duplicate addresses are filtered out. Filtering can be\r
++ configured with the --filter-by option.\r
++\r
+ Note: Searching for **sender** should be much faster than\r
+ searching for **recipients**, because sender addresses are\r
+ cached directly in the database whereas other addresses\r
+@@ -151,6 +154,41 @@ Supported options for **search** include\r
+ prefix. The prefix matches messages based on filenames. This\r
+ option filters filenames of the matching messages.\r
+ \r
++ ``--filter-by=``\ (**nameaddr**\ \|\ **name** \|\ **addr**\ \|\ **addrfold**\ \|\ **nameaddrfold**\)\r
++\r
++ Can be used with ``--output=sender`` or\r
++ ``--output=recipients`` to filter out duplicate addresses. The\r
++ filtering algorithm receives a sequence of email addresses and\r
++ outputs the same sequence without the addresses that are\r
++ considered a duplicate of a previously output address. What is\r
++ considered a duplicate depends on how the two addresses are\r
++ compared and this can be controlled with the follwing flags:\r
++\r
++ **nameaddr** means that both name and address parts are\r
++ compared in case-sensitive manner. Therefore, all same looking\r
++ addresses strings are considered duplicate. This is the\r
++ default.\r
++\r
++ **name** means that only the name part is compared (in\r
++ case-sensitive manner). For example, the addresses "John Doe\r
++ <me@example.com>" and "John Doe <john@doe.name>" will be\r
++ considered duplicate.\r
++\r
++ **addr** means that only the address part is compared (in\r
++ case-sensitive manner). For example, the addresses "John Doe\r
++ <john@example.com>" and "Dr. John Doe <john@example.com>" will\r
++ be considered duplicate.\r
++\r
++ **addrfold** is like **addr**, but comparison is done in\r
++ canse-insensitive manner. For example, the addresses "John Doe\r
++ <john@example.com>" and "Dr. John Doe <JOHN@EXAMPLE.COM>" will\r
++ be considered duplicate.\r
++\r
++ **nameaddrfold** is like **nameaddr**, but address comparison\r
++ is done in canse-insensitive manner. For example, the\r
++ addresses "John Doe <john@example.com>" and "John Doe\r
++ <JOHN@EXAMPLE.COM>" will be considered duplicate.\r
++\r
+ EXIT STATUS\r
+ ===========\r
+ \r
+diff --git a/notmuch-search.c b/notmuch-search.c\r
+index ce3bfb2..47aa979 100644\r
+--- a/notmuch-search.c\r
++++ b/notmuch-search.c\r
+@@ -34,6 +34,14 @@ typedef enum {\r
+ \r
+ #define OUTPUT_ADDRESS_FLAGS (OUTPUT_SENDER | OUTPUT_RECIPIENTS)\r
+ \r
++typedef enum {\r
++ FILTER_BY_NAMEADDR = 0,\r
++ FILTER_BY_NAME,\r
++ FILTER_BY_ADDR,\r
++ FILTER_BY_ADDRFOLD,\r
++ FILTER_BY_NAMEADDRFOLD,\r
++} filter_by_t;\r
++\r
+ typedef struct {\r
+ sprinter_t *format;\r
+ notmuch_query_t *query;\r
+@@ -42,6 +50,7 @@ typedef struct {\r
+ int offset;\r
+ int limit;\r
+ int dupe;\r
++ filter_by_t filter_by;\r
+ } search_options_t;\r
+ \r
+ typedef struct {\r
+@@ -229,6 +238,52 @@ do_search_threads (search_options_t *opt)\r
+ return 0;\r
+ }\r
+ \r
++/* Returns TRUE iff name and/or addr is considered duplicite. */\r
++static notmuch_bool_t\r
++check_duplicite (const search_options_t *opt, GHashTable *addrs, const char *name, const char *addr)\r
++{\r
++ notmuch_bool_t duplicite;\r
++ char *key;\r
++\r
++ if (opt->filter_by == FILTER_BY_ADDRFOLD ||\r
++ opt->filter_by == FILTER_BY_NAMEADDRFOLD) {\r
++ gchar *folded = g_utf8_casefold (addr, -1);\r
++ addr = talloc_strdup (opt->format, folded);\r
++ g_free (folded);\r
++ }\r
++ switch (opt->filter_by) {\r
++ case FILTER_BY_NAMEADDR:\r
++ case FILTER_BY_NAMEADDRFOLD:\r
++ key = talloc_asprintf (opt->format, "%s <%s>", name, addr);\r
++ break;\r
++ case FILTER_BY_NAME:\r
++ key = talloc_strdup (opt->format, name); /* !name results in !key */\r
++ break;\r
++ case FILTER_BY_ADDR:\r
++ case FILTER_BY_ADDRFOLD:\r
++ key = talloc_strdup (opt->format, addr);\r
++ break;\r
++ default:\r
++ INTERNAL_ERROR("invalid --filter-by flags");\r
++ }\r
++\r
++ if (opt->filter_by == FILTER_BY_ADDRFOLD ||\r
++ opt->filter_by == FILTER_BY_NAMEADDRFOLD)\r
++ talloc_free ((char*)addr);\r
++\r
++ if (! key)\r
++ return FALSE;\r
++\r
++ duplicite = g_hash_table_lookup_extended (addrs, key, NULL, NULL);\r
++\r
++ if (! duplicite)\r
++ g_hash_table_insert (addrs, key, NULL);\r
++ else\r
++ talloc_free (key);\r
++\r
++ return duplicite;\r
++}\r
++\r
+ static void\r
+ print_mailbox (const search_options_t *opt, const mailbox_t *mailbox)\r
+ {\r
+@@ -263,7 +318,8 @@ print_mailbox (const search_options_t *opt, const mailbox_t *mailbox)\r
+ }\r
+ \r
+ static void\r
+-process_address_list (const search_options_t *opt, InternetAddressList *list)\r
++process_address_list (const search_options_t *opt, GHashTable *addrs,\r
++ InternetAddressList *list)\r
+ {\r
+ InternetAddress *address;\r
+ int i;\r
+@@ -279,7 +335,7 @@ process_address_list (const search_options_t *opt, InternetAddressList *list)\r
+ if (group_list == NULL)\r
+ continue;\r
+ \r
+- process_address_list (opt, group_list);\r
++ process_address_list (opt, addrs, group_list);\r
+ } else {\r
+ InternetAddressMailbox *mailbox = INTERNET_ADDRESS_MAILBOX (address);\r
+ mailbox_t mbx = {\r
+@@ -287,13 +343,16 @@ process_address_list (const search_options_t *opt, InternetAddressList *list)\r
+ .addr = internet_address_mailbox_get_addr (mailbox),\r
+ };\r
+ \r
++ if (check_duplicite (opt, addrs, mbx.name, mbx.addr))\r
++ continue;\r
++\r
+ print_mailbox (opt, &mbx);\r
+ }\r
+ }\r
+ }\r
+ \r
+ static void\r
+-process_address_header (const search_options_t *opt, const char *value)\r
++process_address_header (const search_options_t *opt, GHashTable *addrs, const char *value)\r
+ {\r
+ InternetAddressList *list;\r
+ \r
+@@ -304,7 +363,13 @@ process_address_header (const search_options_t *opt, const char *value)\r
+ if (list == NULL)\r
+ return;\r
+ \r
+- process_address_list (opt, list);\r
++ process_address_list (opt, addrs, 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
+@@ -314,8 +379,13 @@ do_search_messages (search_options_t *opt)\r
+ notmuch_messages_t *messages;\r
+ notmuch_filenames_t *filenames;\r
+ sprinter_t *format = opt->format;\r
++ GHashTable *addresses = NULL;\r
+ int i;\r
+ \r
++ if (opt->output & OUTPUT_ADDRESS_FLAGS)\r
++ addresses = g_hash_table_new_full (g_str_hash, g_str_equal,\r
++ _my_talloc_free_for_g_hash, NULL);\r
++\r
+ if (opt->offset < 0) {\r
+ opt->offset += notmuch_query_count_messages (opt->query);\r
+ if (opt->offset < 0)\r
+@@ -363,7 +433,7 @@ do_search_messages (search_options_t *opt)\r
+ const char *addrs;\r
+ \r
+ addrs = notmuch_message_get_header (message, "from");\r
+- process_address_header (opt, addrs);\r
++ process_address_header (opt, addresses, addrs);\r
+ }\r
+ \r
+ if (opt->output & OUTPUT_RECIPIENTS) {\r
+@@ -373,7 +443,7 @@ do_search_messages (search_options_t *opt)\r
+ \r
+ for (j = 0; j < ARRAY_SIZE (hdrs); j++) {\r
+ addrs = notmuch_message_get_header (message, hdrs[j]);\r
+- process_address_header (opt, addrs);\r
++ process_address_header (opt, addresses, addrs);\r
+ }\r
+ }\r
+ }\r
+@@ -381,6 +451,9 @@ do_search_messages (search_options_t *opt)\r
+ notmuch_message_destroy (message);\r
+ }\r
+ \r
++ if (addresses)\r
++ g_hash_table_unref (addresses);\r
++\r
+ notmuch_messages_destroy (messages);\r
+ \r
+ format->end (format);\r
+@@ -447,6 +520,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])\r
+ .offset = 0,\r
+ .limit = -1, /* unlimited */\r
+ .dupe = -1,\r
++ .filter_by = FILTER_BY_NAMEADDR,\r
+ };\r
+ char *query_str;\r
+ int opt_index, ret;\r
+@@ -490,6 +564,13 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])\r
+ { NOTMUCH_OPT_INT, &opt.offset, "offset", 'O', 0 },\r
+ { NOTMUCH_OPT_INT, &opt.limit, "limit", 'L', 0 },\r
+ { NOTMUCH_OPT_INT, &opt.dupe, "duplicate", 'D', 0 },\r
++ { NOTMUCH_OPT_KEYWORD, &opt.filter_by, "filter-by", 'b',\r
++ (notmuch_keyword_t []){ { "nameaddr", FILTER_BY_NAMEADDR },\r
++ { "name", FILTER_BY_NAME },\r
++ { "addr", FILTER_BY_ADDR },\r
++ { "addrfold", FILTER_BY_ADDRFOLD },\r
++ { "nameaddrfold", FILTER_BY_NAMEADDRFOLD },\r
++ { 0, 0 } } },\r
+ { 0, 0, 0, 0, 0 }\r
+ };\r
+ \r
+@@ -500,6 +581,11 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])\r
+ if (! opt.output)\r
+ opt.output = OUTPUT_SUMMARY;\r
+ \r
++ if (opt.filter_by && !(opt.output & OUTPUT_ADDRESS_FLAGS)) {\r
++ fprintf (stderr, "Error: --filter-by can only be used with address output.\n");\r
++ return EXIT_FAILURE;\r
++ }\r
++\r
+ switch (format_sel) {\r
+ case NOTMUCH_FORMAT_TEXT:\r
+ opt.format = sprinter_text_create (config, stdout);\r
+diff --git a/test/T090-search-output.sh b/test/T090-search-output.sh\r
+index 947d572..841a721 100755\r
+--- a/test/T090-search-output.sh\r
++++ b/test/T090-search-output.sh\r
+@@ -387,6 +387,93 @@ cat <<EOF >EXPECTED\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
++test_begin_subtest "--output=sender"\r
++notmuch search --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 search --output=sender --format=json '*' >OUTPUT\r
++cat <<EOF >EXPECTED\r
++[{"name": "François Boulogne", "address": "boulogne.f@gmail.com"},\r
++{"name": "Olivier Berger", "address": "olivier.berger@it-sudparis.eu"},\r
++{"name": "Chris Wilson", "address": "chris@chris-wilson.co.uk"},\r
++{"name": "Carl Worth", "address": "cworth@cworth.org"},\r
++{"name": "Alexander Botero-Lowry", "address": "alex.boterolowry@gmail.com"},\r
++{"name": "Keith Packard", "address": "keithp@keithp.com"},\r
++{"name": "Jjgod Jiang", "address": "gzjjgod@gmail.com"},\r
++{"name": "Rolland Santimano", "address": "rollandsantimano@yahoo.com"},\r
++{"name": "Jan Janak", "address": "jan@ryngle.com"},\r
++{"name": "Stewart Smith", "address": "stewart@flamingspork.com"},\r
++{"name": "Lars Kellogg-Stedman", "address": "lars@seas.harvard.edu"},\r
++{"name": "Alex Botero-Lowry", "address": "alex.boterolowry@gmail.com"},\r
++{"name": "Ingmar Vanhassel", "address": "ingmar@exherbo.org"},\r
++{"name": "Aron Griffis", "address": "agriffis@n01se.net"},\r
++{"name": "Adrian Perez de Castro", "address": "aperez@igalia.com"},\r
++{"name": "Israel Herraiz", "address": "isra@herraiz.org"},\r
++{"name": "Mikhail Gusarov", "address": "dottedmag@dottedmag.net"}]\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++test_begin_subtest "--output=recipients"\r
++notmuch search --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 search --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 "sanitize output for quoted-printable line-breaks in author and subject"\r
+ add_message "[subject]='two =?ISO-8859-1?Q?line=0A_subject?=\r
+ headers'"\r
+diff --git a/test/T095-search-filter-by.sh b/test/T095-search-filter-by.sh\r
+new file mode 100755\r
+index 0000000..97d9a9b\r
+--- /dev/null\r
++++ b/test/T095-search-filter-by.sh\r
+@@ -0,0 +1,64 @@\r
++#!/usr/bin/env bash\r
++test_description='duplicite address filtering in "notmuch search --output=recipients"'\r
++. ./test-lib.sh\r
++\r
++add_message '[to]="Real Name <foo@example.com>, Real Name <bar@example.com>"'\r
++add_message '[to]="Nickname <foo@example.com>"' '[cc]="Real Name <Bar@Example.COM>"'\r
++add_message '[to]="Nickname <foo@example.com>"' '[bcc]="Real Name <Bar@Example.COM>"'\r
++\r
++test_begin_subtest "--output=recipients"\r
++notmuch search --output=recipients "*" >OUTPUT\r
++cat <<EOF >EXPECTED\r
++Real Name <foo@example.com>\r
++Real Name <bar@example.com>\r
++Nickname <foo@example.com>\r
++Real Name <Bar@Example.COM>\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++test_begin_subtest "--output=recipients --filter-by=nameaddr"\r
++notmuch search --output=recipients --filter-by=nameaddr "*" >OUTPUT\r
++# The same as above\r
++cat <<EOF >EXPECTED\r
++Real Name <foo@example.com>\r
++Real Name <bar@example.com>\r
++Nickname <foo@example.com>\r
++Real Name <Bar@Example.COM>\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++test_begin_subtest "--output=recipients --filter-by=name"\r
++notmuch search --output=recipients --filter-by=name "*" >OUTPUT\r
++cat <<EOF >EXPECTED\r
++Real Name <foo@example.com>\r
++Nickname <foo@example.com>\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++test_begin_subtest "--output=recipients --filter-by=addr"\r
++notmuch search --output=recipients --filter-by=addr "*" >OUTPUT\r
++cat <<EOF >EXPECTED\r
++Real Name <foo@example.com>\r
++Real Name <bar@example.com>\r
++Real Name <Bar@Example.COM>\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++test_begin_subtest "--output=recipients --filter-by=addrfold"\r
++notmuch search --output=recipients --filter-by=addrfold "*" >OUTPUT\r
++cat <<EOF >EXPECTED\r
++Real Name <foo@example.com>\r
++Real Name <bar@example.com>\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++test_begin_subtest "--output=recipients --filter-by=nameaddrfold"\r
++notmuch search --output=recipients --filter-by=nameaddrfold "*" >OUTPUT\r
++cat <<EOF >EXPECTED\r
++Real Name <foo@example.com>\r
++Real Name <bar@example.com>\r
++Nickname <foo@example.com>\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++test_done\r
+-- \r
+2.1.1\r
+\r
projects / notmuch-archives.git / commitdiff