X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-search.c;h=fd0b58c5d32fd7b3aed6777eb443a1606758ad5c;hp=3c455bfe54428df4a4affc04dc53c1c36a2c369e;hb=33382c2b5ba2537952a60ea378feff36961e4713;hpb=6cdd34a4c762c954426f586d514a3e041c1db3b0 diff --git a/notmuch-search.c b/notmuch-search.c index 3c455bfe..fd0b58c5 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 */ @@ -34,8 +34,15 @@ typedef enum { OUTPUT_SENDER = 1 << 5, OUTPUT_RECIPIENTS = 1 << 6, OUTPUT_COUNT = 1 << 7, + OUTPUT_ADDRESS = 1 << 8, } output_t; +typedef enum { + DEDUP_NONE, + DEDUP_MAILBOX, + DEDUP_ADDRESS, +} dedup_t; + typedef enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT, @@ -45,16 +52,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; + int dedup; } search_context_t; typedef struct { @@ -79,8 +87,7 @@ get_thread_query (notmuch_thread_t *thread, for (messages = notmuch_thread_get_messages (thread); notmuch_messages_valid (messages); - notmuch_messages_move_to_next (messages)) - { + notmuch_messages_move_to_next (messages)) { notmuch_message_t *message = notmuch_messages_get (messages); const char *mid = notmuch_message_get_message_id (message); /* Determine which query buffer to extend */ @@ -95,7 +102,7 @@ get_thread_query (notmuch_thread_t *thread, *buf = talloc_asprintf_append_buffer (*buf, " %s", escaped); else *buf = talloc_strdup (thread, escaped); - if (!*buf) + if (! *buf) return -1; } talloc_free (escaped); @@ -114,21 +121,26 @@ 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); - if (print_status_query("notmuch search", ctx->query, status)) + status = notmuch_query_search_threads (ctx->query, &threads); + if (print_status_query ("notmuch search", ctx->query, status)) return 1; format->begin_list (format); for (i = 0; notmuch_threads_valid (threads) && (ctx->limit < 0 || i < ctx->offset + ctx->limit); - notmuch_threads_move_to_next (threads), i++) - { + notmuch_threads_move_to_next (threads), i++) { thread = notmuch_threads_get (threads); if (i < ctx->offset) { @@ -147,9 +159,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); @@ -161,14 +174,24 @@ do_search_threads (search_context_t *ctx) relative_date = notmuch_time_relative_date (ctx_quote, date); if (format->is_text_printer) { - /* Special case for the text formatter */ - printf ("thread:%s %12s [%d/%d] %s; %s (", + /* Special case for the text formatter */ + printf ("thread:%s %12s ", thread_id, - relative_date, - matched, - total, - sanitize_string (ctx_quote, authors), - sanitize_string (ctx_quote, subject)); + 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); @@ -212,14 +235,13 @@ do_search_threads (search_context_t *ctx) for (tags = notmuch_thread_get_tags (thread); notmuch_tags_valid (tags); - notmuch_tags_move_to_next (tags)) - { + notmuch_tags_move_to_next (tags)) { const char *tag = notmuch_tags_get (tags); if (format->is_text_printer) { - /* Special case for the text formatter */ + /* Special case for the text formatter */ if (first_tag) - first_tag = FALSE; + first_tag = false; else fputc (' ', stdout); fputs (tag, stdout); @@ -244,7 +266,8 @@ do_search_threads (search_context_t *ctx) return 0; } -static mailbox_t *new_mailbox (void *ctx, const char *name, const char *addr) +static mailbox_t * +new_mailbox (void *ctx, const char *name, const char *addr) { mailbox_t *mailbox; @@ -259,32 +282,73 @@ static mailbox_t *new_mailbox (void *ctx, const char *name, const char *addr) return mailbox; } -/* Returns TRUE iff name and addr is duplicate. If not, stores the +static int +mailbox_compare (const void *v1, const void *v2) +{ + const mailbox_t *m1 = v1, *m2 = v2; + int ret; + + ret = strcmp_null (m1->name, m2->name); + if (! ret) + ret = strcmp (m1->addr, m2->addr); + + return ret; +} + +/* 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; + GList *list, *l; mailbox_t *mailbox; - key = talloc_asprintf (ctx->format, "%s <%s>", name, addr); - if (! key) - return FALSE; + list = g_hash_table_lookup (ctx->addresses, addr); + if (list) { + mailbox_t find = { + .name = name, + .addr = addr, + }; + + l = g_list_find_custom (list, &find, mailbox_compare); + if (l) { + mailbox = l->data; + mailbox->count++; + return true; + } - mailbox = g_hash_table_lookup (ctx->addresses, key); - if (mailbox) { - mailbox->count++; - talloc_free (key); - return TRUE; + mailbox = new_mailbox (ctx->format, name, addr); + if (! mailbox) + return false; + + /* + * XXX: It would be more efficient to prepend to the list, but + * then we'd have to store the changed list head back to the + * hash table. This check is here just to avoid the compiler + * warning for unused result. + */ + if (list != g_list_append (list, mailbox)) + INTERNAL_ERROR ("appending to list changed list head\n"); + + return false; } + key = talloc_strdup (ctx->format, addr); + if (! key) + return false; + mailbox = new_mailbox (ctx->format, name, addr); if (! mailbox) - return FALSE; + return false; - g_hash_table_insert (ctx->addresses, key, mailbox); + list = g_list_append (NULL, mailbox); + if (! list) + return false; - return FALSE; + g_hash_table_insert (ctx->addresses, key, list); + + return false; } static void @@ -299,14 +363,17 @@ 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, NULL, false); if (format->is_text_printer) { - if (count > 0) { + if (ctx->output & OUTPUT_COUNT) { format->integer (format, count); format->string (format, "\t"); } - format->string (format, name_addr); + if (ctx->output & OUTPUT_ADDRESS) + format->string (format, addr); + else + format->string (format, name_addr); format->separator (format); } else { format->begin_map (format); @@ -316,7 +383,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); } @@ -353,13 +420,15 @@ 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, }; - if (is_duplicate (ctx, mbx.name, mbx.addr)) + /* OUTPUT_COUNT only works with deduplication */ + if (ctx->dedup != DEDUP_NONE && + 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); @@ -376,7 +445,7 @@ process_address_header (const search_context_t *ctx, const char *value) if (value == NULL) return; - list = internet_address_list_parse_string (value); + list = internet_address_list_parse (NULL, value); if (list == NULL) return; @@ -393,14 +462,56 @@ _talloc_free_for_g_hash (void *ptr) } static void -print_hash_value (unused (gpointer key), gpointer value, gpointer user_data) +_list_free_for_g_hash (void *ptr) { - const mailbox_t *mailbox = value; - search_context_t *ctx = user_data; + 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) +{ + print_mailbox (context, mailbox); +} + +static void +print_hash_value (unused (void *key), void *list, void *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 _count_filenames (notmuch_message_t *message) { @@ -410,8 +521,8 @@ _count_filenames (notmuch_message_t *message) filenames = notmuch_message_get_filenames (message); while (notmuch_filenames_valid (filenames)) { - notmuch_filenames_move_to_next (filenames); - i++; + notmuch_filenames_move_to_next (filenames); + i++; } notmuch_filenames_destroy (filenames); @@ -430,12 +541,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; @@ -443,8 +560,7 @@ do_search_messages (search_context_t *ctx) for (i = 0; notmuch_messages_valid (messages) && (ctx->limit < 0 || i < ctx->offset + ctx->limit); - notmuch_messages_move_to_next (messages), i++) - { + notmuch_messages_move_to_next (messages), i++) { if (i < ctx->offset) continue; @@ -456,24 +572,23 @@ do_search_messages (search_context_t *ctx) for (j = 1; notmuch_filenames_valid (filenames); - notmuch_filenames_move_to_next (filenames), j++) - { + notmuch_filenames_move_to_next (filenames), j++) { if (ctx->dupe < 0 || ctx->dupe == j) { format->string (format, notmuch_filenames_get (filenames)); format->separator (format); } } - - notmuch_filenames_destroy( filenames ); + + notmuch_filenames_destroy ( filenames ); } else if (ctx->output == OUTPUT_MESSAGES) { - /* special case 1 for speed */ - if (ctx->dupe <= 1 || ctx->dupe <= _count_filenames (message)) { - format->set_prefix (format, "id"); - format->string (format, - notmuch_message_get_message_id (message)); - format->separator (format); - } + /* special case 1 for speed */ + if (ctx->dupe <= 1 || ctx->dupe <= _count_filenames (message)) { + format->set_prefix (format, "id"); + format->string (format, + notmuch_message_get_message_id (message)); + format->separator (format); + } } else { if (ctx->output & OUTPUT_SENDER) { const char *addrs; @@ -497,7 +612,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); @@ -525,7 +641,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; @@ -538,8 +654,7 @@ do_search_tags (const search_context_t *ctx) for (; notmuch_tags_valid (tags); - notmuch_tags_move_to_next (tags)) - { + notmuch_tags_move_to_next (tags)) { tag = notmuch_tags_get (tags); format->string (format, tag); @@ -583,7 +698,7 @@ _notmuch_search_prepare (search_context_t *ctx, notmuch_config_t *config, int ar break; default: /* this should never happen */ - INTERNAL_ERROR("no output format selected"); + INTERNAL_ERROR ("no output format selected"); } notmuch_exit_if_unsupported_format (); @@ -631,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++) { + 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; + } + } - 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]); notmuch_query_set_omit_excluded (ctx->query, ctx->exclude); } @@ -659,21 +782,22 @@ static search_context_t search_context = { .offset = 0, .limit = -1, /* unlimited */ .dupe = -1, + .dedup = DEDUP_MAILBOX, }; static const notmuch_opt_desc_t common_options[] = { - { NOTMUCH_OPT_KEYWORD, &search_context.sort, "sort", 's', - (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', - (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_keyword = &search_context.sort, .name = "sort", .keywords = + (notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST }, + { "newest-first", NOTMUCH_SORT_NEWEST_FIRST }, + { 0, 0 } } }, + { .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 } } }, + { .opt_int = ¬much_format_version, .name = "format-version" }, + { } }; int @@ -683,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', - (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', - (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_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 } } }, + { .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 } } }, + { .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; @@ -713,8 +837,8 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) if (ctx->output != OUTPUT_FILES && ctx->output != OUTPUT_MESSAGES && ctx->dupe != -1) { - fprintf (stderr, "Error: --duplicate=N is only supported with --output=files and --output=messages.\n"); - return EXIT_FAILURE; + fprintf (stderr, "Error: --duplicate=N is only supported with --output=files and --output=messages.\n"); + return EXIT_FAILURE; } if (_notmuch_search_prepare (ctx, config, @@ -749,18 +873,24 @@ 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', - (notmuch_keyword_t []){ { "sender", OUTPUT_SENDER }, - { "recipients", OUTPUT_RECIPIENTS }, - { "count", OUTPUT_COUNT }, - { 0, 0 } } }, - { NOTMUCH_OPT_KEYWORD, &ctx->exclude, "exclude", 'x', - (notmuch_keyword_t []){ { "true", NOTMUCH_EXCLUDE_TRUE }, - { "false", NOTMUCH_EXCLUDE_FALSE }, - { 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_flags = &ctx->output, .name = "output", .keywords = + (notmuch_keyword_t []){ { "sender", OUTPUT_SENDER }, + { "recipients", OUTPUT_RECIPIENTS }, + { "count", OUTPUT_COUNT }, + { "address", OUTPUT_ADDRESS }, + { 0, 0 } } }, + { .opt_keyword = &ctx->exclude, .name = "exclude", .keywords = + (notmuch_keyword_t []){ { "true", NOTMUCH_EXCLUDE_TRUE }, + { "false", NOTMUCH_EXCLUDE_FALSE }, + { 0, 0 } } }, + { .opt_keyword = &ctx->dedup, .name = "deduplicate", .keywords = + (notmuch_keyword_t []){ { "no", DEDUP_NONE }, + { "mailbox", DEDUP_MAILBOX }, + { "address", DEDUP_ADDRESS }, + { 0, 0 } } }, + { .opt_inherit = common_options }, + { .opt_inherit = notmuch_shared_options }, + { } }; opt_index = parse_arguments (argc, argv, options, 1); @@ -772,12 +902,23 @@ notmuch_address_command (notmuch_config_t *config, int argc, char *argv[]) if (! (ctx->output & (OUTPUT_SENDER | OUTPUT_RECIPIENTS))) ctx->output |= OUTPUT_SENDER; + if (ctx->output & OUTPUT_COUNT && ctx->dedup == DEDUP_NONE) { + fprintf (stderr, "--output=count is not applicable with --deduplicate=no\n"); + return EXIT_FAILURE; + } + if (_notmuch_search_prepare (ctx, config, argc - opt_index, argv + opt_index)) return EXIT_FAILURE; - ctx->addresses = g_hash_table_new_full (g_str_hash, g_str_equal, - _talloc_free_for_g_hash, _talloc_free_for_g_hash); + ctx->addresses = g_hash_table_new_full (strcase_hash, strcase_equal, + _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);