X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-search.c;h=faccaf7deec10961f5f2c2c7bdc5fa9bef4521f7;hp=bb989dac854bc7f12f4207c5a4eaa237d1401309;hb=d752509abfd7697d2f8a1c5be6f96f0df4f0299d;hpb=44ea57a0d10ddab514abea319c4d25ec4e36b51e diff --git a/notmuch-search.c b/notmuch-search.c index bb989dac..faccaf7d 100644 --- a/notmuch-search.c +++ b/notmuch-search.c @@ -48,6 +48,7 @@ typedef struct search_format { const char *item_sep; const char *item_end; const char *results_end; + const char *results_null; } search_format_t; static void @@ -73,6 +74,7 @@ static const search_format_t format_text = { ")", "\n", "", "\n", + "", }; static void @@ -98,6 +100,7 @@ static const search_format_t format_json = { "]", ",\n", "}", "]\n", + "]\n", }; static void @@ -108,6 +111,23 @@ format_item_id_text (unused (const void *ctx), printf ("%s%s", item_type, item_id); } +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; +} + static void format_thread_text (const void *ctx, const char *thread_id, @@ -117,13 +137,17 @@ format_thread_text (const void *ctx, const char *authors, const char *subject) { + void *ctx_quote = talloc_new (ctx); + printf ("thread:%s %12s [%d/%d] %s; %s", thread_id, notmuch_time_relative_date (ctx, date), matched, total, - authors, - subject); + sanitize_string (ctx_quote, authors), + sanitize_string (ctx_quote, subject)); + + talloc_free (ctx_quote); } static void @@ -167,8 +191,7 @@ format_thread_json (const void *ctx, } static int -do_search_threads (const void *ctx, - const search_format_t *format, +do_search_threads (const search_format_t *format, notmuch_query_t *query, notmuch_sort_t sort, output_t output) @@ -183,21 +206,21 @@ do_search_threads (const void *ctx, if (threads == NULL) return 1; + fputs (format->results_start, stdout); + for (; notmuch_threads_valid (threads); notmuch_threads_move_to_next (threads)) { int first_tag = 1; - if (first_thread) - fputs (format->results_start, stdout); - else + if (! first_thread) fputs (format->item_sep, stdout); thread = notmuch_threads_get (threads); if (output == OUTPUT_THREADS) { - format->item_id (ctx, "thread:", + format->item_id (thread, "thread:", notmuch_thread_get_thread_id (thread)); } else { /* output == OUTPUT_SUMMARY */ fputs (format->item_start, stdout); @@ -207,7 +230,7 @@ do_search_threads (const void *ctx, else date = notmuch_thread_get_newest_date (thread); - format->thread_summary (ctx, + format->thread_summary (thread, notmuch_thread_get_thread_id (thread), date, notmuch_thread_get_matched_messages (thread), @@ -237,61 +260,78 @@ do_search_threads (const void *ctx, notmuch_thread_destroy (thread); } - if (! first_thread) + if (first_thread) + fputs (format->results_null, stdout); + else fputs (format->results_end, stdout); return 0; } static int -do_search_messages (const void *ctx, - const search_format_t *format, +do_search_messages (const search_format_t *format, notmuch_query_t *query, output_t output) { notmuch_message_t *message; notmuch_messages_t *messages; + notmuch_filenames_t *filenames; int first_message = 1; messages = notmuch_query_search_messages (query); if (messages == NULL) return 1; + fputs (format->results_start, stdout); + for (; notmuch_messages_valid (messages); notmuch_messages_move_to_next (messages)) { message = notmuch_messages_get (messages); - if (first_message) - fputs (format->results_start, stdout); - else - fputs (format->item_sep, stdout); - if (output == OUTPUT_FILES) { - format->item_id (ctx, "", - notmuch_message_get_filename (message)); + filenames = notmuch_message_get_filenames (message); + + for (; + notmuch_filenames_valid (filenames); + notmuch_filenames_move_to_next (filenames)) + { + if (! first_message) + fputs (format->item_sep, stdout); + + format->item_id (message, "", + notmuch_filenames_get (filenames)); + + first_message = 0; + } + + notmuch_filenames_destroy( filenames ); + } else { /* output == OUTPUT_MESSAGES */ - format->item_id (ctx, "id:", + if (! first_message) + fputs (format->item_sep, stdout); + + format->item_id (message, "id:", notmuch_message_get_message_id (message)); + first_message = 0; } - first_message = 0; - notmuch_message_destroy (message); } notmuch_messages_destroy (messages); - if (! first_message) + if (first_message) + fputs (format->results_null, stdout); + else fputs (format->results_end, stdout); return 0; } static int -do_search_tags (const void *ctx, - notmuch_database_t *notmuch, +do_search_tags (notmuch_database_t *notmuch, const search_format_t *format, notmuch_query_t *query) { @@ -313,6 +353,8 @@ do_search_tags (const void *ctx, if (tags == NULL) return 1; + fputs (format->results_start, stdout); + for (; notmuch_tags_valid (tags); notmuch_tags_move_to_next (tags)) @@ -322,7 +364,7 @@ do_search_tags (const void *ctx, if (! first_tag) fputs (format->item_sep, stdout); - format->item_id (ctx, "", tag); + format->item_id (tags, "", tag); first_tag = 0; } @@ -332,6 +374,11 @@ do_search_tags (const void *ctx, if (messages) notmuch_messages_destroy (messages); + if (first_tag) + fputs (format->results_null, stdout); + else + fputs (format->results_end, stdout); + return 0; } @@ -407,7 +454,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) if (notmuch == NULL) return 1; - query_str = query_string_from_args (ctx, argc, argv); + query_str = query_string_from_args (notmuch, argc, argv); if (query_str == NULL) { fprintf (stderr, "Out of memory.\n"); return 1; @@ -429,14 +476,14 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) default: case OUTPUT_SUMMARY: case OUTPUT_THREADS: - ret = do_search_threads (ctx, format, query, sort, output); + ret = do_search_threads (format, query, sort, output); break; case OUTPUT_MESSAGES: case OUTPUT_FILES: - ret = do_search_messages (ctx, format, query, output); + ret = do_search_messages (format, query, output); break; case OUTPUT_TAGS: - ret = do_search_tags (ctx, notmuch, format, query); + ret = do_search_tags (notmuch, format, query); break; }