X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-search.c;h=14b9f01c5ad1d731d802e2f7a18bb5f9ef8e6597;hp=f11535942d566e4e386008b2adcbefa2cc318ec7;hb=0d8251dbe236975e69b07de2aeb9b60df44d6929;hpb=f0dfceaf902681e7d5fd56a3c272a17a71996141 diff --git a/notmuch-search.c b/notmuch-search.c index f1153594..14b9f01c 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,41 @@ do_search_threads (search_context_t *ctx) return 0; } +/* 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, (gpointer)&mailbox); + + if (! duplicate) { + mailbox = talloc (ctx->format, mailbox_t); + mailbox->name = talloc_strdup (mailbox, name); + mailbox->addr = talloc_strdup (mailbox, addr); + mailbox->count = 1; + g_hash_table_insert (ctx->addresses, key, mailbox); + } else { + mailbox->count++; + talloc_free (key); + } + + return duplicate; +} + 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 +287,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 +301,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 +313,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 +338,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 +370,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 +481,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); @@ -554,39 +623,42 @@ _notmuch_search_cleanup (search_context_t *ctx) 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 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, - }; search_context_t *ctx = &search_context; int opt_index, ret; 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_OPT_KEYWORD, &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 } } }, @@ -599,16 +671,15 @@ 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 }, { 0, 0, 0, 0, 0 } }; + ctx->output = OUTPUT_SUMMARY; 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"); @@ -619,20 +690,66 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) argc - opt_index, argv + opt_index)) return EXIT_FAILURE; - if (ctx->output == OUTPUT_SUMMARY || - ctx->output == OUTPUT_THREADS) + switch (ctx->output) { + case OUTPUT_SUMMARY: + case 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))) + break; + case OUTPUT_MESSAGES: + case OUTPUT_FILES: ret = do_search_messages (ctx); - else if (ctx->output == OUTPUT_TAGS) + break; + case OUTPUT_TAGS: ret = do_search_tags (ctx); - else { - fprintf (stderr, "Error: the combination of outputs is not supported.\n"); - ret = 1; + break; + default: + INTERNAL_ERROR ("Unexpected output"); } + _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, &common_options, NULL, 0, 0 }, + { 0, 0, 0, 0, 0 } + }; + + opt_index = parse_arguments (argc, argv, options, 1); + if (opt_index < 0) + return EXIT_FAILURE; + + 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); + + _notmuch_search_cleanup (ctx); return ret ? EXIT_FAILURE : EXIT_SUCCESS;