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