--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\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 15CBA431FBC\r
+ for <notmuch@notmuchmail.org>; Fri, 31 Oct 2014 18:16:36 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, 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 dVVFHYwpDjx9 for <notmuch@notmuchmail.org>;\r
+ Fri, 31 Oct 2014 18:16:28 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 31D05431FAF\r
+ for <notmuch@notmuchmail.org>; Fri, 31 Oct 2014 18:16:28 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1XkNIo-0000nD-3j; Sat, 01 Nov 2014 01:16:26 +0000\r
+Received: from 5751dfa2.skybroadband.com ([87.81.223.162] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1XkNIn-0000D7-5O; Sat, 01 Nov 2014 01:16:25 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Michal Sojka <sojkam1@fel.cvut.cz>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v6 6/7] cli: search: Add --output=count\r
+In-Reply-To: <1414792441-29555-7-git-send-email-sojkam1@fel.cvut.cz>\r
+References: <1414792441-29555-1-git-send-email-sojkam1@fel.cvut.cz>\r
+ <1414792441-29555-7-git-send-email-sojkam1@fel.cvut.cz>\r
+User-Agent: Notmuch/0.18.1+86~gef5e66a (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sat, 01 Nov 2014 01:16:20 +0000\r
+Message-ID: <87r3xnu3dn.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 87.81.223.162\r
+X-QM-Geographic: According to ripencc,\r
+ this message was delivered by a machine in Britain (UK) (GB).\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: b0db5e32fd3b8eeef637529a8567f93c (of first 20000 bytes)\r
+X-SpamAssassin-Score: -0.1\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -0.1 points.\r
+ Summary of the scoring: \r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * -0.1 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Sat, 01 Nov 2014 01:16:36 -0000\r
+\r
+\r
+On Fri, 31 Oct 2014, Michal Sojka <sojkam1@fel.cvut.cz> wrote:\r
+> This output can be used with --output=recipients or --output=sender\r
+> and in addition to the addresses, it prints how many times was each\r
+> address encountered during search.\r
+\r
+Hi\r
+\r
+I have a couple comments on this patch.\r
+\r
+> ---\r
+> completion/notmuch-completion.bash | 2 +-\r
+> completion/notmuch-completion.zsh | 2 +-\r
+> doc/man1/notmuch-search.rst | 9 +++++--\r
+> notmuch-search.c | 51 ++++++++++++++++++++++++++++++++------\r
+> 4 files changed, 52 insertions(+), 12 deletions(-)\r
+>\r
+> diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash\r
+> index cfbd389..39cd829 100644\r
+> --- a/completion/notmuch-completion.bash\r
+> +++ b/completion/notmuch-completion.bash\r
+> @@ -294,7 +294,7 @@ _notmuch_search()\r
+> return\r
+> ;;\r
+> --output)\r
+> - COMPREPLY=( $( compgen -W "summary threads messages files tags sender recipients" -- "${cur}" ) )\r
+> + COMPREPLY=( $( compgen -W "summary threads messages files tags sender recipients count" -- "${cur}" ) )\r
+> return\r
+> ;;\r
+> --sort)\r
+> diff --git a/completion/notmuch-completion.zsh b/completion/notmuch-completion.zsh\r
+> index 3e52a00..d7e5a5e 100644\r
+> --- a/completion/notmuch-completion.zsh\r
+> +++ b/completion/notmuch-completion.zsh\r
+> @@ -53,7 +53,7 @@ _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 count))'\r
+> }\r
+> \r
+> _notmuch()\r
+> diff --git a/doc/man1/notmuch-search.rst b/doc/man1/notmuch-search.rst\r
+> index 42f17e4..ec89200 100644\r
+> --- a/doc/man1/notmuch-search.rst\r
+> +++ b/doc/man1/notmuch-search.rst\r
+> @@ -96,9 +96,14 @@ Supported options for **search** include\r
+> Like **sender** but for addresses from *To*, *Cc* and\r
+> *Bcc* headers.\r
+> \r
+> + **count**\r
+> + Can be used in combination with **sender** or\r
+> + **recipients** to print the count of how many times was\r
+> + the address encountered during search.\r
+> +\r
+> This option can be given multiple times to combine different\r
+> - outputs. Currently, this is only supported for **sender** and\r
+> - **recipients** outputs.\r
+> + outputs. Currently, this is only supported for **sender**,\r
+> + **recipients** and **count** outputs.\r
+\r
+It might be worth saying that the results will be slower if count is\r
+specified.\r
+\r
+> ``--sort=``\ (**newest-first**\ \|\ **oldest-first**)\r
+\r
+I think sort works as expected if count is not specified, but does not\r
+with count. Maybe count can be done by doing two passes? If it is\r
+difficult it might be sufficient to just document that sort has no\r
+effect.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+\r
+> This option can be used to present results in either\r
+> diff --git a/notmuch-search.c b/notmuch-search.c\r
+> index 43d42c6..4b39dfc 100644\r
+> --- a/notmuch-search.c\r
+> +++ b/notmuch-search.c\r
+> @@ -30,9 +30,10 @@ typedef enum {\r
+> OUTPUT_TAGS = 1 << 4,\r
+> OUTPUT_SENDER = 1 << 5,\r
+> OUTPUT_RECIPIENTS = 1 << 6,\r
+> + OUTPUT_COUNT = 1 << 7,\r
+> } output_t;\r
+> \r
+> -#define OUTPUT_ADDRESS_FLAGS (OUTPUT_SENDER | OUTPUT_RECIPIENTS)\r
+> +#define OUTPUT_ADDRESS_FLAGS (OUTPUT_SENDER | OUTPUT_RECIPIENTS | OUTPUT_COUNT)\r
+> \r
+> typedef struct {\r
+> sprinter_t *format;\r
+> @@ -47,6 +48,7 @@ typedef struct {\r
+> typedef struct {\r
+> const char *name;\r
+> const char *addr;\r
+> + int count;\r
+> } mailbox_t;\r
+> \r
+> /* Return two stable query strings that identify exactly the matched\r
+> @@ -235,17 +237,24 @@ is_duplicate (const search_options_t *opt, GHashTable *addrs, const char *name,\r
+> {\r
+> notmuch_bool_t duplicate;\r
+> char *key;\r
+> + mailbox_t *mailbox;\r
+> \r
+> key = talloc_asprintf (opt->format, "%s <%s>", name, addr);\r
+> if (! key)\r
+> return FALSE;\r
+> \r
+> - duplicate = g_hash_table_lookup_extended (addrs, key, NULL, NULL);\r
+> + duplicate = g_hash_table_lookup_extended (addrs, key, NULL, (gpointer)&mailbox);\r
+> \r
+> - if (! duplicate)\r
+> - g_hash_table_insert (addrs, key, NULL);\r
+> - else\r
+> + if (! duplicate) {\r
+> + mailbox = talloc (opt->format, mailbox_t);\r
+> + mailbox->name = talloc_strdup (mailbox, name);\r
+> + mailbox->addr = talloc_strdup (mailbox, addr);\r
+> + mailbox->count = 1;\r
+> + g_hash_table_insert (addrs, key, mailbox);\r
+> + } else {\r
+> + mailbox->count++;\r
+> talloc_free (key);\r
+> + }\r
+> \r
+> return duplicate;\r
+> }\r
+> @@ -255,6 +264,7 @@ print_mailbox (const search_options_t *opt, const mailbox_t *mailbox)\r
+> {\r
+> const char *name = mailbox->name;\r
+> const char *addr = mailbox->addr;\r
+> + int count = mailbox->count;\r
+> sprinter_t *format = opt->format;\r
+> InternetAddress *ia = internet_address_mailbox_new (name, addr);\r
+> char *name_addr;\r
+> @@ -264,6 +274,10 @@ print_mailbox (const search_options_t *opt, const mailbox_t *mailbox)\r
+> name_addr = internet_address_to_string (ia, FALSE);\r
+> \r
+> if (format->is_text_printer) {\r
+> + if (count > 0) {\r
+> + format->integer (format, count);\r
+> + format->string (format, "\t");\r
+> + }\r
+> format->string (format, name_addr);\r
+> format->separator (format);\r
+> } else {\r
+> @@ -274,6 +288,10 @@ print_mailbox (const search_options_t *opt, const mailbox_t *mailbox)\r
+> format->string (format, addr);\r
+> format->map_key (format, "name-addr");\r
+> format->string (format, name_addr);\r
+> + if (count > 0) {\r
+> + format->map_key (format, "count");\r
+> + format->integer (format, count);\r
+> + }\r
+> format->end (format);\r
+> format->separator (format);\r
+> }\r
+> @@ -282,7 +300,7 @@ print_mailbox (const search_options_t *opt, const mailbox_t *mailbox)\r
+> g_free (name_addr);\r
+> }\r
+> \r
+> -/* Print addresses from InternetAddressList. */\r
+> +/* Print or prepare for printing addresses from InternetAddressList. */\r
+> static void\r
+> process_address_list (const search_options_t *opt, GHashTable *addrs,\r
+> InternetAddressList *list)\r
+> @@ -307,17 +325,21 @@ process_address_list (const search_options_t *opt, GHashTable *addrs,\r
+> mailbox_t mbx = {\r
+> .name = internet_address_get_name (address),\r
+> .addr = internet_address_mailbox_get_addr (mailbox),\r
+> + .count = 0,\r
+> };\r
+> \r
+> if (is_duplicate (opt, addrs, mbx.name, mbx.addr))\r
+> continue;\r
+> \r
+> + if (opt->output & OUTPUT_COUNT)\r
+> + continue;\r
+> +\r
+> print_mailbox (opt, &mbx);\r
+> }\r
+> }\r
+> }\r
+> \r
+> -/* Print addresses from a message header. */\r
+> +/* Print or prepare for printing addresses from a message header. */\r
+> static void\r
+> process_address_header (const search_options_t *opt, GHashTable *addrs, const char *value)\r
+> {\r
+> @@ -341,6 +363,15 @@ _my_talloc_free_for_g_hash (void *ptr)\r
+> talloc_free (ptr);\r
+> }\r
+> \r
+> +static void\r
+> +print_hash_value (unused (gpointer key), gpointer value, gpointer user_data)\r
+> +{\r
+> + const mailbox_t *mailbox = value;\r
+> + search_options_t *opt = user_data;\r
+> +\r
+> + print_mailbox (opt, mailbox);\r
+> +}\r
+> +\r
+> static int\r
+> do_search_messages (search_options_t *opt)\r
+> {\r
+> @@ -353,7 +384,7 @@ do_search_messages (search_options_t *opt)\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
+> + _my_talloc_free_for_g_hash, _my_talloc_free_for_g_hash);\r
+> \r
+> if (opt->offset < 0) {\r
+> opt->offset += notmuch_query_count_messages (opt->query);\r
+> @@ -420,6 +451,9 @@ do_search_messages (search_options_t *opt)\r
+> notmuch_message_destroy (message);\r
+> }\r
+> \r
+> + if (addresses && opt->output & OUTPUT_COUNT)\r
+> + g_hash_table_foreach (addresses, print_hash_value, opt);\r
+> +\r
+> if (addresses)\r
+> g_hash_table_unref (addresses);\r
+> \r
+> @@ -522,6 +556,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])\r
+> { "recipients", OUTPUT_RECIPIENTS },\r
+> { "files", OUTPUT_FILES },\r
+> { "tags", OUTPUT_TAGS },\r
+> + { "count", OUTPUT_COUNT },\r
+> { 0, 0 } } },\r
+> { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x',\r
+> (notmuch_keyword_t []){ { "true", NOTMUCH_EXCLUDE_TRUE },\r
+> -- \r
+> 2.1.1\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff