X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-search.c;h=0abac08eb7ab3a2720fdeb7d3b67717dd833039f;hp=6cac0fcdc1dfa042a3c68bd8ffda4987acf01f05;hb=886c0b1666478548485682fbcaa667bb3cc0f138;hpb=b8f4e7da3d61733fb47111b162ccabb967a3661e diff --git a/notmuch-search.c b/notmuch-search.c index 6cac0fcd..0abac08e 100644 --- a/notmuch-search.c +++ b/notmuch-search.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/ . + * along with this program. If not, see https://www.gnu.org/licenses/ . * * Author: Carl Worth */ @@ -39,6 +39,7 @@ typedef enum { typedef enum { DEDUP_NONE, DEDUP_MAILBOX, + DEDUP_ADDRESS, } dedup_t; typedef enum { @@ -50,17 +51,17 @@ typedef enum { typedef struct { notmuch_database_t *notmuch; - format_sel_t format_sel; + int format_sel; sprinter_t *format; - notmuch_exclude_t exclude; + int exclude; notmuch_query_t *query; - notmuch_sort_t sort; - output_t output; + int sort; + int output; int offset; int limit; int dupe; GHashTable *addresses; - dedup_t dedup; + int dedup; } search_context_t; typedef struct { @@ -120,12 +121,18 @@ do_search_threads (search_context_t *ctx) notmuch_status_t status; if (ctx->offset < 0) { - ctx->offset += notmuch_query_count_threads (ctx->query); + unsigned count; + notmuch_status_t status; + status = notmuch_query_count_threads (ctx->query, &count); + if (print_status_query ("notmuch search", ctx->query, status)) + return 1; + + ctx->offset += count; if (ctx->offset < 0) ctx->offset = 0; } - status = notmuch_query_search_threads_st (ctx->query, &threads); + status = notmuch_query_search_threads (ctx->query, &threads); if (print_status_query("notmuch search", ctx->query, status)) return 1; @@ -153,9 +160,10 @@ do_search_threads (search_context_t *ctx) const char *subject = notmuch_thread_get_subject (thread); const char *thread_id = notmuch_thread_get_thread_id (thread); int matched = notmuch_thread_get_matched_messages (thread); + int files = notmuch_thread_get_total_files (thread); int total = notmuch_thread_get_total_messages (thread); const char *relative_date = NULL; - notmuch_bool_t first_tag = TRUE; + bool first_tag = true; format->begin_map (format); @@ -168,13 +176,23 @@ do_search_threads (search_context_t *ctx) if (format->is_text_printer) { /* Special case for the text formatter */ - printf ("thread:%s %12s [%d/%d] %s; %s (", + printf ("thread:%s %12s ", thread_id, - relative_date, + relative_date); + if (total == files) + printf ("[%d/%d] %s; %s (", + matched, + total, + sanitize_string (ctx_quote, authors), + sanitize_string (ctx_quote, subject)); + else + printf ("[%d/%d(%d)] %s; %s (", matched, total, + files, sanitize_string (ctx_quote, authors), sanitize_string (ctx_quote, subject)); + } else { /* Structured Output */ format->map_key (format, "thread"); format->string (format, thread_id); @@ -225,7 +243,7 @@ do_search_threads (search_context_t *ctx) if (format->is_text_printer) { /* Special case for the text formatter */ if (first_tag) - first_tag = FALSE; + first_tag = false; else fputc (' ', stdout); fputs (tag, stdout); @@ -277,9 +295,9 @@ static int mailbox_compare (const void *v1, const void *v2) return ret; } -/* Returns TRUE iff name and addr is duplicate. If not, stores the +/* Returns true iff name and addr is duplicate. If not, stores the * name/addr pair in order to detect subsequent duplicates. */ -static notmuch_bool_t +static bool is_duplicate (const search_context_t *ctx, const char *name, const char *addr) { char *key; @@ -297,12 +315,12 @@ is_duplicate (const search_context_t *ctx, const char *name, const char *addr) if (l) { mailbox = l->data; mailbox->count++; - return TRUE; + return true; } mailbox = new_mailbox (ctx->format, name, addr); if (! mailbox) - return FALSE; + return false; /* * XXX: It would be more efficient to prepend to the list, but @@ -313,24 +331,24 @@ is_duplicate (const search_context_t *ctx, const char *name, const char *addr) if (list != g_list_append (list, mailbox)) INTERNAL_ERROR ("appending to list changed list head\n"); - return FALSE; + return false; } key = talloc_strdup (ctx->format, addr); if (! key) - return FALSE; + return false; mailbox = new_mailbox (ctx->format, name, addr); if (! mailbox) - return FALSE; + return false; list = g_list_append (NULL, mailbox); if (! list) - return FALSE; + return false; g_hash_table_insert (ctx->addresses, key, list); - return FALSE; + return false; } static void @@ -345,10 +363,10 @@ print_mailbox (const search_context_t *ctx, const mailbox_t *mailbox) /* name_addr has the name part quoted if necessary. Compare * 'John Doe ' vs. '"Doe, John" ' */ - name_addr = internet_address_to_string (ia, FALSE); + name_addr = internet_address_to_string (ia, false); if (format->is_text_printer) { - if (count > 0) { + if (ctx->output & OUTPUT_COUNT) { format->integer (format, count); format->string (format, "\t"); } @@ -362,7 +380,7 @@ print_mailbox (const search_context_t *ctx, const mailbox_t *mailbox) format->string (format, addr); format->map_key (format, "name-addr"); format->string (format, name_addr); - if (count > 0) { + if (ctx->output & OUTPUT_COUNT) { format->map_key (format, "count"); format->integer (format, count); } @@ -399,7 +417,6 @@ process_address_list (const search_context_t *ctx, mailbox_t mbx = { .name = internet_address_get_name (address), .addr = internet_address_mailbox_get_addr (mailbox), - .count = 0, }; /* OUTPUT_COUNT only works with deduplication */ @@ -407,7 +424,8 @@ process_address_list (const search_context_t *ctx, is_duplicate (ctx, mbx.name, mbx.addr)) continue; - if (ctx->output & OUTPUT_COUNT) + /* OUTPUT_COUNT and DEDUP_ADDRESS require a full pass. */ + if (ctx->output & OUTPUT_COUNT || ctx->dedup == DEDUP_ADDRESS) continue; print_mailbox (ctx, &mbx); @@ -446,6 +464,34 @@ _list_free_for_g_hash (void *ptr) g_list_free_full (ptr, _talloc_free_for_g_hash); } +/* Print the most common variant of a list of unique mailboxes, and + * conflate the counts. */ +static void +print_popular (const search_context_t *ctx, GList *list) +{ + GList *l; + mailbox_t *mailbox = NULL, *m; + int max = 0; + int total = 0; + + for (l = list; l; l = l->next) { + m = l->data; + total += m->count; + if (m->count > max) { + mailbox = m; + max = m->count; + } + } + + if (! mailbox) + INTERNAL_ERROR("Empty list in address hash table\n"); + + /* The original count is no longer needed, so overwrite. */ + mailbox->count = total; + + print_mailbox (ctx, mailbox); +} + static void print_list_value (void *mailbox, void *context) { @@ -455,7 +501,12 @@ print_list_value (void *mailbox, void *context) static void print_hash_value (unused (void *key), void *list, void *context) { - g_list_foreach (list, print_list_value, context); + const search_context_t *ctx = context; + + if (ctx->dedup == DEDUP_ADDRESS) + print_popular (ctx, list); + else + g_list_foreach (list, print_list_value, context); } static int @@ -487,12 +538,18 @@ do_search_messages (search_context_t *ctx) notmuch_status_t status; if (ctx->offset < 0) { - ctx->offset += notmuch_query_count_messages (ctx->query); + unsigned count; + notmuch_status_t status; + status = notmuch_query_count_messages (ctx->query, &count); + if (print_status_query ("notmuch search", ctx->query, status)) + return 1; + + ctx->offset += count; if (ctx->offset < 0) ctx->offset = 0; } - status = notmuch_query_search_messages_st (ctx->query, &messages); + status = notmuch_query_search_messages (ctx->query, &messages); if (print_status_query ("notmuch search", ctx->query, status)) return 1; @@ -554,7 +611,8 @@ do_search_messages (search_context_t *ctx) notmuch_message_destroy (message); } - if (ctx->addresses && ctx->output & OUTPUT_COUNT) + if (ctx->addresses && + (ctx->output & OUTPUT_COUNT || ctx->dedup == DEDUP_ADDRESS)) g_hash_table_foreach (ctx->addresses, print_hash_value, ctx); notmuch_messages_destroy (messages); @@ -582,7 +640,7 @@ do_search_tags (const search_context_t *ctx) tags = notmuch_database_get_all_tags (notmuch); } else { notmuch_status_t status; - status = notmuch_query_search_messages_st (query, &messages); + status = notmuch_query_search_messages (query, &messages); if (print_status_query ("notmuch search", query, status)) return 1; @@ -688,11 +746,19 @@ _notmuch_search_prepare (search_context_t *ctx, notmuch_config_t *config, int ar if (ctx->exclude != NOTMUCH_EXCLUDE_FALSE) { const char **search_exclude_tags; size_t search_exclude_tags_length; + notmuch_status_t status; search_exclude_tags = notmuch_config_get_search_exclude_tags (config, &search_exclude_tags_length); - for (i = 0; i < search_exclude_tags_length; i++) - notmuch_query_add_tag_exclude (ctx->query, search_exclude_tags[i]); + + for (i = 0; i < search_exclude_tags_length; i++) { + status = notmuch_query_add_tag_exclude (ctx->query, search_exclude_tags[i]); + if (status && status != NOTMUCH_STATUS_IGNORED) { + print_status_query ("notmuch search", ctx->query, status); + return EXIT_FAILURE; + } + } + notmuch_query_set_omit_excluded (ctx->query, ctx->exclude); } @@ -720,18 +786,18 @@ static search_context_t search_context = { }; static const notmuch_opt_desc_t common_options[] = { - { NOTMUCH_OPT_KEYWORD, &search_context.sort, "sort", 's', + { .opt_keyword = &search_context.sort, .name = "sort", .keywords = (notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST }, { "newest-first", NOTMUCH_SORT_NEWEST_FIRST }, { 0, 0 } } }, - { NOTMUCH_OPT_KEYWORD, &search_context.format_sel, "format", 'f', + { .opt_keyword = &search_context.format_sel, .name = "format", .keywords = (notmuch_keyword_t []){ { "json", NOTMUCH_FORMAT_JSON }, { "sexp", NOTMUCH_FORMAT_SEXP }, { "text", NOTMUCH_FORMAT_TEXT }, { "text0", NOTMUCH_FORMAT_TEXT0 }, { 0, 0 } } }, - { NOTMUCH_OPT_INT, ¬much_format_version, "format-version", 0, 0 }, - { 0, 0, 0, 0, 0 } + { .opt_int = ¬much_format_version, .name = "format-version" }, + { } }; int @@ -741,25 +807,25 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) int opt_index, ret; notmuch_opt_desc_t options[] = { - { NOTMUCH_OPT_KEYWORD, &ctx->output, "output", 'o', + { .opt_keyword = &ctx->output, .name = "output", .keywords = (notmuch_keyword_t []){ { "summary", OUTPUT_SUMMARY }, { "threads", OUTPUT_THREADS }, { "messages", OUTPUT_MESSAGES }, { "files", OUTPUT_FILES }, { "tags", OUTPUT_TAGS }, { 0, 0 } } }, - { NOTMUCH_OPT_KEYWORD, &ctx->exclude, "exclude", 'x', + { .opt_keyword = &ctx->exclude, .name = "exclude", .keywords = (notmuch_keyword_t []){ { "true", NOTMUCH_EXCLUDE_TRUE }, { "false", NOTMUCH_EXCLUDE_FALSE }, { "flag", NOTMUCH_EXCLUDE_FLAG }, { "all", NOTMUCH_EXCLUDE_ALL }, { 0, 0 } } }, - { NOTMUCH_OPT_INT, &ctx->offset, "offset", 'O', 0 }, - { NOTMUCH_OPT_INT, &ctx->limit, "limit", 'L', 0 }, - { NOTMUCH_OPT_INT, &ctx->dupe, "duplicate", 'D', 0 }, - { NOTMUCH_OPT_INHERIT, (void *) &common_options, NULL, 0, 0 }, - { NOTMUCH_OPT_INHERIT, (void *) ¬much_shared_options, NULL, 0, 0 }, - { 0, 0, 0, 0, 0 } + { .opt_int = &ctx->offset, .name = "offset" }, + { .opt_int = &ctx->limit, .name = "limit" }, + { .opt_int = &ctx->dupe, .name = "duplicate" }, + { .opt_inherit = common_options }, + { .opt_inherit = notmuch_shared_options }, + { } }; ctx->output = OUTPUT_SUMMARY; @@ -807,22 +873,23 @@ notmuch_address_command (notmuch_config_t *config, int argc, char *argv[]) int opt_index, ret; notmuch_opt_desc_t options[] = { - { NOTMUCH_OPT_KEYWORD_FLAGS, &ctx->output, "output", 'o', + { .opt_flags = &ctx->output, .name = "output", .keywords = (notmuch_keyword_t []){ { "sender", OUTPUT_SENDER }, { "recipients", OUTPUT_RECIPIENTS }, { "count", OUTPUT_COUNT }, { 0, 0 } } }, - { NOTMUCH_OPT_KEYWORD, &ctx->exclude, "exclude", 'x', + { .opt_keyword = &ctx->exclude, .name = "exclude", .keywords = (notmuch_keyword_t []){ { "true", NOTMUCH_EXCLUDE_TRUE }, { "false", NOTMUCH_EXCLUDE_FALSE }, { 0, 0 } } }, - { NOTMUCH_OPT_KEYWORD, &ctx->dedup, "deduplicate", 'D', + { .opt_keyword = &ctx->dedup, .name = "deduplicate", .keywords = (notmuch_keyword_t []){ { "no", DEDUP_NONE }, { "mailbox", DEDUP_MAILBOX }, + { "address", DEDUP_ADDRESS }, { 0, 0 } } }, - { NOTMUCH_OPT_INHERIT, (void *) &common_options, NULL, 0, 0 }, - { NOTMUCH_OPT_INHERIT, (void *) ¬much_shared_options, NULL, 0, 0 }, - { 0, 0, 0, 0, 0 } + { .opt_inherit = common_options }, + { .opt_inherit = notmuch_shared_options }, + { } }; opt_index = parse_arguments (argc, argv, options, 1); @@ -847,6 +914,11 @@ notmuch_address_command (notmuch_config_t *config, int argc, char *argv[]) _talloc_free_for_g_hash, _list_free_for_g_hash); + /* The order is not guaranteed if a full pass is required, so go + * for fastest. */ + if (ctx->output & OUTPUT_COUNT || ctx->dedup == DEDUP_ADDRESS) + notmuch_query_set_sort (ctx->query, NOTMUCH_SORT_UNSORTED); + ret = do_search_messages (ctx); g_hash_table_unref (ctx->addresses);