X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=notmuch-search.c;h=3c455bfe54428df4a4affc04dc53c1c36a2c369e;hb=6cdd34a4c762c954426f586d514a3e041c1db3b0;hp=86d54ba044357001c6e46f10d2fb2b76a3f00eba;hpb=4176e527fceb2c1f7a0b263fd8baac88be6fab4c;p=notmuch diff --git a/notmuch-search.c b/notmuch-search.c index 86d54ba0..3c455bfe 100644 --- a/notmuch-search.c +++ b/notmuch-search.c @@ -33,6 +33,7 @@ typedef enum { /* Address command */ OUTPUT_SENDER = 1 << 5, OUTPUT_RECIPIENTS = 1 << 6, + OUTPUT_COUNT = 1 << 7, } output_t; typedef enum { @@ -59,6 +60,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 @@ -109,6 +111,7 @@ do_search_threads (search_context_t *ctx) sprinter_t *format = ctx->format; time_t date; int i; + notmuch_status_t status; if (ctx->offset < 0) { ctx->offset += notmuch_query_count_threads (ctx->query); @@ -116,8 +119,8 @@ do_search_threads (search_context_t *ctx) ctx->offset = 0; } - threads = notmuch_query_search_threads (ctx->query); - if (threads == NULL) + status = notmuch_query_search_threads_st (ctx->query, &threads); + if (print_status_query("notmuch search", ctx->query, status)) return 1; format->begin_list (format); @@ -241,26 +244,47 @@ do_search_threads (search_context_t *ctx) return 0; } +static mailbox_t *new_mailbox (void *ctx, const char *name, const char *addr) +{ + mailbox_t *mailbox; + + mailbox = talloc (ctx, mailbox_t); + if (! mailbox) + return NULL; + + mailbox->name = talloc_strdup (mailbox, name); + mailbox->addr = talloc_strdup (mailbox, addr); + mailbox->count = 1; + + return mailbox; +} + /* 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 is_duplicate (const search_context_t *ctx, const char *name, const char *addr) { - notmuch_bool_t duplicate; char *key; + mailbox_t *mailbox; key = talloc_asprintf (ctx->format, "%s <%s>", name, addr); if (! key) return FALSE; - duplicate = g_hash_table_lookup_extended (ctx->addresses, key, NULL, NULL); - - if (! duplicate) - g_hash_table_insert (ctx->addresses, key, NULL); - else + 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; + + g_hash_table_insert (ctx->addresses, key, mailbox); - return duplicate; + return FALSE; } static void @@ -268,6 +292,7 @@ print_mailbox (const search_context_t *ctx, const mailbox_t *mailbox) { const char *name = mailbox->name; const char *addr = mailbox->addr; + int count = mailbox->count; sprinter_t *format = ctx->format; InternetAddress *ia = internet_address_mailbox_new (name, addr); char *name_addr; @@ -277,6 +302,10 @@ print_mailbox (const search_context_t *ctx, 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 { @@ -287,6 +316,10 @@ 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) { + format->map_key (format, "count"); + format->integer (format, count); + } format->end (format); format->separator (format); } @@ -295,7 +328,7 @@ print_mailbox (const search_context_t *ctx, 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_context_t *ctx, InternetAddressList *list) @@ -320,17 +353,21 @@ 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)) continue; + if (ctx->output & OUTPUT_COUNT) + continue; + print_mailbox (ctx, &mbx); } } } -/* Print addresses from a message header. */ +/* Print or prepare for printing addresses from a message header. */ static void process_address_header (const search_context_t *ctx, const char *value) { @@ -355,6 +392,15 @@ _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_context_t *ctx = user_data; + + print_mailbox (ctx, mailbox); +} + static int _count_filenames (notmuch_message_t *message) { @@ -381,6 +427,7 @@ do_search_messages (search_context_t *ctx) notmuch_filenames_t *filenames; sprinter_t *format = ctx->format; int i; + notmuch_status_t status; if (ctx->offset < 0) { ctx->offset += notmuch_query_count_messages (ctx->query); @@ -388,8 +435,8 @@ do_search_messages (search_context_t *ctx) ctx->offset = 0; } - messages = notmuch_query_search_messages (ctx->query); - if (messages == NULL) + status = notmuch_query_search_messages_st (ctx->query, &messages); + if (print_status_query ("notmuch search", ctx->query, status)) return 1; format->begin_list (format); @@ -450,6 +497,9 @@ do_search_messages (search_context_t *ctx) notmuch_message_destroy (message); } + if (ctx->addresses && ctx->output & OUTPUT_COUNT) + g_hash_table_foreach (ctx->addresses, print_hash_value, ctx); + notmuch_messages_destroy (messages); format->end (format); @@ -474,8 +524,9 @@ do_search_tags (const search_context_t *ctx) if (strcmp (notmuch_query_get_query_string (query), "*") == 0) { tags = notmuch_database_get_all_tags (notmuch); } else { - messages = notmuch_query_search_messages (query); - if (messages == NULL) + notmuch_status_t status; + status = notmuch_query_search_messages_st (query, &messages); + if (print_status_query ("notmuch search", query, status)) return 1; tags = notmuch_messages_collect_tags (messages); @@ -511,6 +562,7 @@ _notmuch_search_prepare (search_context_t *ctx, notmuch_config_t *config, int ar { char *query_str; unsigned int i; + char *status_string = NULL; switch (ctx->format_sel) { case NOTMUCH_FORMAT_TEXT: @@ -536,9 +588,19 @@ _notmuch_search_prepare (search_context_t *ctx, notmuch_config_t *config, int ar notmuch_exit_if_unsupported_format (); - if (notmuch_database_open (notmuch_config_get_database_path (config), - NOTMUCH_DATABASE_MODE_READ_ONLY, &ctx->notmuch)) + if (notmuch_database_open_verbose ( + notmuch_config_get_database_path (config), + NOTMUCH_DATABASE_MODE_READ_ONLY, &ctx->notmuch, &status_string)) { + + if (status_string) { + fputs (status_string, stderr); + free (status_string); + } + return EXIT_FAILURE; + } + + notmuch_exit_if_unmatched_db_uuid (ctx->notmuch); query_str = query_string_from_args (ctx->notmuch, argc, argv); if (query_str == NULL) { @@ -637,7 +699,8 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) { 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, &common_options, NULL, 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 } }; @@ -646,6 +709,8 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) if (opt_index < 0) return EXIT_FAILURE; + notmuch_process_shared_options (argv[0]); + 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"); @@ -687,12 +752,14 @@ notmuch_address_command (notmuch_config_t *config, int argc, char *argv[]) { 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, &common_options, NULL, 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 } }; @@ -700,15 +767,17 @@ notmuch_address_command (notmuch_config_t *config, int argc, char *argv[]) if (opt_index < 0) return EXIT_FAILURE; - if (! ctx->output) - ctx->output = OUTPUT_SENDER | OUTPUT_RECIPIENTS; + notmuch_process_shared_options (argv[0]); + + if (! (ctx->output & (OUTPUT_SENDER | OUTPUT_RECIPIENTS))) + ctx->output |= OUTPUT_SENDER; 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, NULL); + _talloc_free_for_g_hash, _talloc_free_for_g_hash); ret = do_search_messages (ctx);