OUTPUT_SUMMARY,
OUTPUT_THREADS,
OUTPUT_MESSAGES,
+ OUTPUT_FILES,
OUTPUT_TAGS
} output_t;
{
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);
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,
- notmuch_query_t *query)
+ notmuch_query_t *query,
+ output_t output)
{
notmuch_message_t *message;
notmuch_messages_t *messages;
{
message = notmuch_messages_get (messages);
- if (! first_message)
+ if (first_message)
+ fputs (format->results_start, stdout);
+ else
fputs (format->item_sep, stdout);
- format->item_id (ctx, "id:", notmuch_message_get_message_id (message));
+ if (output == OUTPUT_FILES) {
+ format->item_id (ctx, "",
+ notmuch_message_get_filename (message));
+ } else { /* output == OUTPUT_MESSAGES */
+ format->item_id (ctx, "id:",
+ notmuch_message_get_message_id (message));
+ }
first_message = 0;
notmuch_messages_destroy (messages);
+ if (! first_message)
+ fputs (format->results_end, stdout);
+
return 0;
}
output = OUTPUT_THREADS;
} else if (strcmp (opt, "messages") == 0) {
output = OUTPUT_MESSAGES;
+ } else if (strcmp (opt, "files") == 0) {
+ output = OUTPUT_FILES;
} else if (strcmp (opt, "tags") == 0) {
output = OUTPUT_TAGS;
} else {
notmuch_query_set_sort (query, sort);
- fputs (format->results_start, stdout);
-
switch (output) {
default:
case OUTPUT_SUMMARY:
ret = do_search_threads (ctx, format, query, sort, output);
break;
case OUTPUT_MESSAGES:
- ret = do_search_messages (ctx, format, query);
+ case OUTPUT_FILES:
+ ret = do_search_messages (ctx, format, query, output);
break;
case OUTPUT_TAGS:
ret = do_search_tags (ctx, notmuch, format, query);
break;
}
- fputs (format->results_end, stdout);
-
notmuch_query_destroy (query);
notmuch_database_close (notmuch);