X-Git-Url: http://rtime.felk.cvut.cz/gitweb/notmuch.git/blobdiff_plain/28d7544ae2adfe6467c6b64a3284f5ed13f81e1a..9df4107fc4df164b0155e3d34e1d06363106e0dc:/notmuch-search.c diff --git a/notmuch-search.c b/notmuch-search.c index 91b5d105..0614f102 100644 --- a/notmuch-search.c +++ b/notmuch-search.c @@ -23,29 +23,25 @@ #include "string-util.h" typedef enum { - OUTPUT_SUMMARY, - OUTPUT_THREADS, - OUTPUT_MESSAGES, - OUTPUT_FILES, - OUTPUT_TAGS + OUTPUT_SUMMARY = 1 << 0, + OUTPUT_THREADS = 1 << 1, + OUTPUT_MESSAGES = 1 << 2, + OUTPUT_FILES = 1 << 3, + OUTPUT_TAGS = 1 << 4, + OUTPUT_SENDER = 1 << 5, + OUTPUT_RECIPIENTS = 1 << 6, + OUTPUT_ADDRESSES = OUTPUT_SENDER | OUTPUT_RECIPIENTS, } output_t; -static char * -sanitize_string (const void *ctx, const char *str) -{ - char *out, *loop; - - if (NULL == str) - return NULL; - - loop = out = talloc_strdup (ctx, str); - - for (; *loop; loop++) { - if ((unsigned char)(*loop) < 32) - *loop = '?'; - } - return out; -} +typedef struct { + sprinter_t *format; + notmuch_query_t *query; + notmuch_sort_t sort; + output_t output; + int offset; + int limit; + int dupe; +} search_options_t; /* Return two stable query strings that identify exactly the matched * and unmatched messages currently in thread. If there are no @@ -87,46 +83,42 @@ get_thread_query (notmuch_thread_t *thread, } static int -do_search_threads (sprinter_t *format, - notmuch_query_t *query, - notmuch_sort_t sort, - output_t output, - int offset, - int limit) +do_search_threads (search_options_t *o) { notmuch_thread_t *thread; notmuch_threads_t *threads; notmuch_tags_t *tags; + sprinter_t *format = o->format; time_t date; int i; - if (offset < 0) { - offset += notmuch_query_count_threads (query); - if (offset < 0) - offset = 0; + if (o->offset < 0) { + o->offset += notmuch_query_count_threads (o->query); + if (o->offset < 0) + o->offset = 0; } - threads = notmuch_query_search_threads (query); + threads = notmuch_query_search_threads (o->query); if (threads == NULL) return 1; format->begin_list (format); for (i = 0; - notmuch_threads_valid (threads) && (limit < 0 || i < offset + limit); + notmuch_threads_valid (threads) && (o->limit < 0 || i < o->offset + o->limit); notmuch_threads_move_to_next (threads), i++) { thread = notmuch_threads_get (threads); - if (i < offset) { + if (i < o->offset) { notmuch_thread_destroy (thread); continue; } - if (output == OUTPUT_THREADS) { + if (o->output == OUTPUT_THREADS) { format->set_prefix (format, "thread"); format->string (format, - notmuch_thread_get_thread_id (thread)); + notmuch_thread_get_thread_id (thread)); format->separator (format); } else { /* output == OUTPUT_SUMMARY */ void *ctx_quote = talloc_new (thread); @@ -140,7 +132,7 @@ do_search_threads (sprinter_t *format, format->begin_map (format); - if (sort == NOTMUCH_SORT_OLDEST_FIRST) + if (o->sort == NOTMUCH_SORT_OLDEST_FIRST) date = notmuch_thread_get_oldest_date (thread); else date = notmuch_thread_get_newest_date (thread); @@ -231,41 +223,98 @@ do_search_threads (sprinter_t *format, return 0; } +static void +print_address_list (const search_options_t *o, InternetAddressList *list) +{ + InternetAddress *address; + int i; + + for (i = 0; i < internet_address_list_length (list); i++) { + address = internet_address_list_get_address (list, i); + if (INTERNET_ADDRESS_IS_GROUP (address)) { + InternetAddressGroup *group; + InternetAddressList *group_list; + + group = INTERNET_ADDRESS_GROUP (address); + group_list = internet_address_group_get_members (group); + if (group_list == NULL) + continue; + + print_address_list (o, group_list); + } else { + InternetAddressMailbox *mailbox; + const char *name; + const char *addr; + char *full_address; + + mailbox = INTERNET_ADDRESS_MAILBOX (address); + + name = internet_address_get_name (address); + addr = internet_address_mailbox_get_addr (mailbox); + + if (name && *name) + full_address = talloc_asprintf (o->format, "%s <%s>", name, addr); + else + full_address = talloc_strdup (o->format, addr); + + if (!full_address) { + fprintf (stderr, "Error: out of memory\n"); + break; + } + o->format->string (o->format, full_address); + o->format->separator (o->format); + + talloc_free (full_address); + } + } +} + +static void +print_address_string (const search_options_t *o, const char *recipients) +{ + InternetAddressList *list; + + if (recipients == NULL) + return; + + list = internet_address_list_parse_string (recipients); + if (list == NULL) + return; + + print_address_list (o, list); +} + static int -do_search_messages (sprinter_t *format, - notmuch_query_t *query, - output_t output, - int offset, - int limit, - int dupe) +do_search_messages (search_options_t *o) { notmuch_message_t *message; notmuch_messages_t *messages; notmuch_filenames_t *filenames; + sprinter_t *format = o->format; int i; - if (offset < 0) { - offset += notmuch_query_count_messages (query); - if (offset < 0) - offset = 0; + if (o->offset < 0) { + o->offset += notmuch_query_count_messages (o->query); + if (o->offset < 0) + o->offset = 0; } - messages = notmuch_query_search_messages (query); + messages = notmuch_query_search_messages (o->query); if (messages == NULL) return 1; format->begin_list (format); for (i = 0; - notmuch_messages_valid (messages) && (limit < 0 || i < offset + limit); + notmuch_messages_valid (messages) && (o->limit < 0 || i < o->offset + o->limit); notmuch_messages_move_to_next (messages), i++) { - if (i < offset) + if (i < o->offset) continue; message = notmuch_messages_get (messages); - if (output == OUTPUT_FILES) { + if (o->output == OUTPUT_FILES) { int j; filenames = notmuch_message_get_filenames (message); @@ -273,7 +322,7 @@ do_search_messages (sprinter_t *format, notmuch_filenames_valid (filenames); notmuch_filenames_move_to_next (filenames), j++) { - if (dupe < 0 || dupe == j) { + if (o->dupe < 0 || o->dupe == j) { format->string (format, notmuch_filenames_get (filenames)); format->separator (format); } @@ -281,11 +330,29 @@ do_search_messages (sprinter_t *format, notmuch_filenames_destroy( filenames ); - } else { /* output == OUTPUT_MESSAGES */ + } else if (o->output == OUTPUT_MESSAGES) { format->set_prefix (format, "id"); format->string (format, notmuch_message_get_message_id (message)); format->separator (format); + } else { + if (o->output & OUTPUT_SENDER) { + const char *addrs; + + addrs = notmuch_message_get_header (message, "from"); + print_address_string (o, addrs); + } + + if (o->output & OUTPUT_RECIPIENTS) { + const char *hdrs[] = { "to", "cc", "bcc" }; + const char *addrs; + size_t j; + + for (j = 0; j < ARRAY_SIZE (hdrs); j++) { + addrs = notmuch_message_get_header (message, hdrs[j]); + print_address_string (o, addrs); + } + } } notmuch_message_destroy (message); @@ -350,16 +417,16 @@ int notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) { notmuch_database_t *notmuch; - notmuch_query_t *query; + search_options_t o = { + .sort = NOTMUCH_SORT_NEWEST_FIRST, + .output = OUTPUT_SUMMARY, + .offset = 0, + .limit = -1, /* unlimited */ + .dupe = -1, + }; char *query_str; - notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST; - sprinter_t *format = NULL; int opt_index, ret; - output_t output = OUTPUT_SUMMARY; - int offset = 0; - int limit = -1; /* unlimited */ notmuch_exclude_t exclude = NOTMUCH_EXCLUDE_TRUE; - int dupe = -1; unsigned int i; enum { @@ -370,7 +437,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) } format_sel = NOTMUCH_FORMAT_TEXT; notmuch_opt_desc_t options[] = { - { NOTMUCH_OPT_KEYWORD, &sort, "sort", 's', + { NOTMUCH_OPT_KEYWORD, &o.sort, "sort", 's', (notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST }, { "newest-first", NOTMUCH_SORT_NEWEST_FIRST }, { 0, 0 } } }, @@ -381,10 +448,13 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) { "text0", NOTMUCH_FORMAT_TEXT0 }, { 0, 0 } } }, { NOTMUCH_OPT_INT, ¬much_format_version, "format-version", 0, 0 }, - { NOTMUCH_OPT_KEYWORD, &output, "output", 'o', + { NOTMUCH_OPT_KEYWORD, &o.output, "output", 'o', (notmuch_keyword_t []){ { "summary", OUTPUT_SUMMARY }, { "threads", OUTPUT_THREADS }, { "messages", OUTPUT_MESSAGES }, + { "sender", OUTPUT_SENDER }, + { "recipients", OUTPUT_RECIPIENTS }, + { "addresses", OUTPUT_ADDRESSES }, { "files", OUTPUT_FILES }, { "tags", OUTPUT_TAGS }, { 0, 0 } } }, @@ -394,9 +464,9 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) { "flag", NOTMUCH_EXCLUDE_FLAG }, { "all", NOTMUCH_EXCLUDE_ALL }, { 0, 0 } } }, - { NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 }, - { NOTMUCH_OPT_INT, &limit, "limit", 'L', 0 }, - { NOTMUCH_OPT_INT, &dupe, "duplicate", 'D', 0 }, + { NOTMUCH_OPT_INT, &o.offset, "offset", 'O', 0 }, + { NOTMUCH_OPT_INT, &o.limit, "limit", 'L', 0 }, + { NOTMUCH_OPT_INT, &o.dupe, "duplicate", 'D', 0 }, { 0, 0, 0, 0, 0 } }; @@ -406,20 +476,20 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) switch (format_sel) { case NOTMUCH_FORMAT_TEXT: - format = sprinter_text_create (config, stdout); + o.format = sprinter_text_create (config, stdout); break; case NOTMUCH_FORMAT_TEXT0: - if (output == OUTPUT_SUMMARY) { + if (o.output == OUTPUT_SUMMARY) { fprintf (stderr, "Error: --format=text0 is not compatible with --output=summary.\n"); return EXIT_FAILURE; } - format = sprinter_text0_create (config, stdout); + o.format = sprinter_text0_create (config, stdout); break; case NOTMUCH_FORMAT_JSON: - format = sprinter_json_create (config, stdout); + o.format = sprinter_json_create (config, stdout); break; case NOTMUCH_FORMAT_SEXP: - format = sprinter_sexp_create (config, stdout); + o.format = sprinter_sexp_create (config, stdout); break; default: /* this should never happen */ @@ -442,15 +512,15 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) return EXIT_FAILURE; } - query = notmuch_query_create (notmuch, query_str); - if (query == NULL) { + o.query = notmuch_query_create (notmuch, query_str); + if (o.query == NULL) { fprintf (stderr, "Out of memory\n"); return EXIT_FAILURE; } - notmuch_query_set_sort (query, sort); + notmuch_query_set_sort (o.query, o.sort); - if (exclude == NOTMUCH_EXCLUDE_FLAG && output != OUTPUT_SUMMARY) { + if (exclude == NOTMUCH_EXCLUDE_FLAG && o.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. */ @@ -465,29 +535,32 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) 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 (query, search_exclude_tags[i]); - notmuch_query_set_omit_excluded (query, exclude); + notmuch_query_add_tag_exclude (o.query, search_exclude_tags[i]); + notmuch_query_set_omit_excluded (o.query, exclude); } - switch (output) { + switch (o.output) { default: case OUTPUT_SUMMARY: case OUTPUT_THREADS: - ret = do_search_threads (format, query, sort, output, offset, limit); + ret = do_search_threads (&o); break; case OUTPUT_MESSAGES: + case OUTPUT_SENDER: + case OUTPUT_RECIPIENTS: + case OUTPUT_ADDRESSES: case OUTPUT_FILES: - ret = do_search_messages (format, query, output, offset, limit, dupe); + ret = do_search_messages (&o); break; case OUTPUT_TAGS: - ret = do_search_tags (notmuch, format, query); + ret = do_search_tags (notmuch, o.format, o.query); break; } - notmuch_query_destroy (query); + notmuch_query_destroy (o.query); notmuch_database_destroy (notmuch); - talloc_free (format); + talloc_free (o.format); return ret ? EXIT_FAILURE : EXIT_SUCCESS; }