X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-search.c;h=36f58eb8d54ce6f8584d03cab357611186f871a4;hp=3d2012b7725788c2700af80832a8a06005650d2b;hb=243ca658dff5aefa2d6c76121451463360fa56a7;hpb=33f9109fd3b72e9648505b3d259a97553c5bf4b2 diff --git a/notmuch-search.c b/notmuch-search.c index 3d2012b7..36f58eb8 100644 --- a/notmuch-search.c +++ b/notmuch-search.c @@ -23,17 +23,19 @@ #include "string-util.h" typedef enum { + /* Search command */ OUTPUT_SUMMARY = 1 << 0, OUTPUT_THREADS = 1 << 1, OUTPUT_MESSAGES = 1 << 2, OUTPUT_FILES = 1 << 3, OUTPUT_TAGS = 1 << 4, + + /* Address command */ OUTPUT_SENDER = 1 << 5, OUTPUT_RECIPIENTS = 1 << 6, + OUTPUT_COUNT = 1 << 7, } output_t; -#define OUTPUT_ADDRESS_FLAGS (OUTPUT_SENDER | OUTPUT_RECIPIENTS) - typedef enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT, @@ -52,11 +54,13 @@ typedef struct { int offset; int limit; int dupe; + GHashTable *addresses; } search_context_t; typedef struct { const char *name; const char *addr; + int count; } mailbox_t; /* Return two stable query strings that identify exactly the matched @@ -239,11 +243,55 @@ 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) +{ + char *key; + mailbox_t *mailbox; + + key = talloc_asprintf (ctx->format, "%s <%s>", name, addr); + if (! key) + return FALSE; + + 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 FALSE; +} + static void 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; @@ -253,6 +301,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 { @@ -263,6 +315,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); } @@ -271,9 +327,10 @@ 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) +process_address_list (const search_context_t *ctx, + InternetAddressList *list) { InternetAddress *address; int i; @@ -295,14 +352,21 @@ process_address_list (const search_context_t *ctx, InternetAddressList *list) 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) { @@ -320,6 +384,22 @@ process_address_header (const search_context_t *ctx, const char *value) g_object_unref (list); } +/* Destructor for talloc-allocated GHashTable keys and values. */ +static void +_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) { @@ -415,6 +495,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); @@ -471,84 +554,29 @@ do_search_tags (const search_context_t *ctx) return 0; } -int -notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) +static int +_notmuch_search_prepare (search_context_t *ctx, notmuch_config_t *config, int argc, char *argv[]) { - search_context_t ctx = { - .format_sel = NOTMUCH_FORMAT_TEXT, - .exclude = NOTMUCH_EXCLUDE_TRUE, - .sort = NOTMUCH_SORT_NEWEST_FIRST, - .output = 0, - .offset = 0, - .limit = -1, /* unlimited */ - .dupe = -1, - }; char *query_str; - int opt_index, ret; unsigned int i; + char *status_string = NULL; - notmuch_opt_desc_t options[] = { - { NOTMUCH_OPT_KEYWORD, &ctx.sort, "sort", 's', - (notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST }, - { "newest-first", NOTMUCH_SORT_NEWEST_FIRST }, - { 0, 0 } } }, - { NOTMUCH_OPT_KEYWORD, &ctx.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 }, - { NOTMUCH_OPT_KEYWORD_FLAGS, &ctx.output, "output", 'o', - (notmuch_keyword_t []){ { "summary", OUTPUT_SUMMARY }, - { "threads", OUTPUT_THREADS }, - { "messages", OUTPUT_MESSAGES }, - { "sender", OUTPUT_SENDER }, - { "recipients", OUTPUT_RECIPIENTS }, - { "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 }, - { 0, 0, 0, 0, 0 } - }; - - opt_index = parse_arguments (argc, argv, options, 1); - if (opt_index < 0) - return EXIT_FAILURE; - - if (! ctx.output) - ctx.output = OUTPUT_SUMMARY; - - 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; - } - - switch (ctx.format_sel) { + switch (ctx->format_sel) { case NOTMUCH_FORMAT_TEXT: - ctx.format = sprinter_text_create (config, stdout); + ctx->format = sprinter_text_create (config, stdout); break; case NOTMUCH_FORMAT_TEXT0: - if (ctx.output == OUTPUT_SUMMARY) { + if (ctx->output == OUTPUT_SUMMARY) { fprintf (stderr, "Error: --format=text0 is not compatible with --output=summary.\n"); return EXIT_FAILURE; } - ctx.format = sprinter_text0_create (config, stdout); + ctx->format = sprinter_text0_create (config, stdout); break; case NOTMUCH_FORMAT_JSON: - ctx.format = sprinter_json_create (config, stdout); + ctx->format = sprinter_json_create (config, stdout); break; case NOTMUCH_FORMAT_SEXP: - ctx.format = sprinter_sexp_create (config, stdout); + ctx->format = sprinter_sexp_create (config, stdout); break; default: /* this should never happen */ @@ -557,11 +585,21 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) 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; + } - query_str = query_string_from_args (ctx.notmuch, argc-opt_index, argv+opt_index); + notmuch_exit_if_unmatched_db_uuid (ctx->notmuch); + + query_str = query_string_from_args (ctx->notmuch, argc, argv); if (query_str == NULL) { fprintf (stderr, "Out of memory.\n"); return EXIT_FAILURE; @@ -571,51 +609,179 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) return EXIT_FAILURE; } - ctx.query = notmuch_query_create (ctx.notmuch, query_str); - if (ctx.query == NULL) { + ctx->query = notmuch_query_create (ctx->notmuch, query_str); + if (ctx->query == NULL) { fprintf (stderr, "Out of memory\n"); return EXIT_FAILURE; } - notmuch_query_set_sort (ctx.query, ctx.sort); + notmuch_query_set_sort (ctx->query, ctx->sort); - if (ctx.exclude == NOTMUCH_EXCLUDE_FLAG && ctx.output != OUTPUT_SUMMARY) { + if (ctx->exclude == NOTMUCH_EXCLUDE_FLAG && ctx->output != OUTPUT_SUMMARY) { /* If we are not doing summary output there is nowhere to * print the excluded flag so fall back on including the * excluded messages. */ fprintf (stderr, "Warning: this output format cannot flag excluded messages.\n"); - ctx.exclude = NOTMUCH_EXCLUDE_FALSE; + ctx->exclude = NOTMUCH_EXCLUDE_FALSE; } - if (ctx.exclude != NOTMUCH_EXCLUDE_FALSE) { + if (ctx->exclude != NOTMUCH_EXCLUDE_FALSE) { const char **search_exclude_tags; size_t search_exclude_tags_length; 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); + notmuch_query_add_tag_exclude (ctx->query, search_exclude_tags[i]); + notmuch_query_set_omit_excluded (ctx->query, ctx->exclude); + } + + return 0; +} + +static void +_notmuch_search_cleanup (search_context_t *ctx) +{ + notmuch_query_destroy (ctx->query); + notmuch_database_destroy (ctx->notmuch); + + talloc_free (ctx->format); +} + +static search_context_t search_context = { + .format_sel = NOTMUCH_FORMAT_TEXT, + .exclude = NOTMUCH_EXCLUDE_TRUE, + .sort = NOTMUCH_SORT_NEWEST_FIRST, + .output = 0, + .offset = 0, + .limit = -1, /* unlimited */ + .dupe = -1, +}; + +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 } +}; + +int +notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) +{ + search_context_t *ctx = &search_context; + 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 } + }; + + ctx->output = OUTPUT_SUMMARY; + opt_index = parse_arguments (argc, argv, options, 1); + 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"); + return EXIT_FAILURE; } - if (ctx.output == OUTPUT_SUMMARY || - ctx.output == OUTPUT_THREADS) - ret = do_search_threads (&ctx); - else if (ctx.output == OUTPUT_MESSAGES || - ctx.output == OUTPUT_FILES || - (ctx.output & OUTPUT_ADDRESS_FLAGS && !(ctx.output & ~OUTPUT_ADDRESS_FLAGS))) - ret = do_search_messages (&ctx); - else if (ctx.output == OUTPUT_TAGS) - ret = do_search_tags (&ctx); - else { - fprintf (stderr, "Error: the combination of outputs is not supported.\n"); - ret = 1; + if (_notmuch_search_prepare (ctx, config, + argc - opt_index, argv + opt_index)) + return EXIT_FAILURE; + + switch (ctx->output) { + case OUTPUT_SUMMARY: + case OUTPUT_THREADS: + ret = do_search_threads (ctx); + break; + case OUTPUT_MESSAGES: + case OUTPUT_FILES: + ret = do_search_messages (ctx); + break; + case OUTPUT_TAGS: + ret = do_search_tags (ctx); + break; + default: + INTERNAL_ERROR ("Unexpected output"); } - notmuch_query_destroy (ctx.query); - notmuch_database_destroy (ctx.notmuch); + _notmuch_search_cleanup (ctx); + + return ret ? EXIT_FAILURE : EXIT_SUCCESS; +} + +int +notmuch_address_command (notmuch_config_t *config, int argc, char *argv[]) +{ + search_context_t *ctx = &search_context; + 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_index = parse_arguments (argc, argv, options, 1); + if (opt_index < 0) + return EXIT_FAILURE; + + 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, _talloc_free_for_g_hash); + + ret = do_search_messages (ctx); + + g_hash_table_unref (ctx->addresses); + - talloc_free (ctx.format); + _notmuch_search_cleanup (ctx); return ret ? EXIT_FAILURE : EXIT_SUCCESS; }