new: Add all initial tags at once

[notmuch] / notmuch-search.c

diff --git a/notmuch-search.c b/notmuch-search.c
index 5907c2ee23d2f12ea9649c66d423bcba79b4699a..a91b23110d240b755064bec12f0b2d28cd8affe0 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -167,8 +167,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)
@@ -189,13 +188,15 @@ do_search_threads (const void *ctx,
     {
        int first_tag = 1;
 
-       if (! first_thread)
+       if (first_thread)
+           fputs (format->results_start, stdout);
+       else
            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);
@@ -205,7 +206,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),
@@ -235,12 +236,14 @@ do_search_threads (const void *ctx,
        notmuch_thread_destroy (thread);
     }
 
+    if (! first_thread)
+       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)
 {
@@ -258,14 +261,16 @@ do_search_messages (const void *ctx,
     {
        message = notmuch_messages_get (messages);
 
-       if (! first_message)
+       if (first_message)
+           fputs (format->results_start, stdout);
+       else
            fputs (format->item_sep, stdout);
 
        if (output == OUTPUT_FILES) {
-           format->item_id (ctx, "",
+           format->item_id (message, "",
                             notmuch_message_get_filename (message));
        } else { /* output == OUTPUT_MESSAGES */
-           format->item_id (ctx, "id:",
+           format->item_id (message, "id:",
                             notmuch_message_get_message_id (message));
        }
 
@@ -276,12 +281,14 @@ do_search_messages (const void *ctx,
 
     notmuch_messages_destroy (messages);
 
+    if (! first_message)
+       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)
 {
@@ -309,10 +316,12 @@ do_search_tags (const void *ctx,
     {
        tag = notmuch_tags_get (tags);
 
-       if (! first_tag)
+       if (first_tag)
+           fputs (format->results_start, stdout);
+       else
            fputs (format->item_sep, stdout);
 
-       format->item_id (ctx, "", tag);
+       format->item_id (tags, "", tag);
 
        first_tag = 0;
     }
@@ -322,6 +331,9 @@ do_search_tags (const void *ctx,
     if (messages)
        notmuch_messages_destroy (messages);
 
+    if (! first_tag)
+       fputs (format->results_end, stdout);
+
     return 0;
 }
 
@@ -397,7 +409,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;
@@ -415,25 +427,21 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
 
     notmuch_query_set_sort (query, sort);
 
-    fputs (format->results_start, stdout);
-
     switch (output) {
     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;
     }
 
-    fputs (format->results_end, stdout);
-
     notmuch_query_destroy (query);
     notmuch_database_close (notmuch);