From 53311617494feb4ce575e9676cba938b93d5ebfb Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Thu, 28 Oct 2010 11:33:55 -0700
Subject: [PATCH] notmuch search: Add a new "notmuch search --output=files"

Yet another thing that will be extremely handy for scripts.
---
 notmuch-search.c | 17 ++++++++++++++---
 notmuch.1        |  7 +++++++
 notmuch.c        |  6 ++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/notmuch-search.c b/notmuch-search.c
index 93724dd2..5907c2ee 100644
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -24,6 +24,7 @@ typedef enum {
     OUTPUT_SUMMARY,
     OUTPUT_THREADS,
     OUTPUT_MESSAGES,
+    OUTPUT_FILES,
     OUTPUT_TAGS
 } output_t;
 
@@ -240,7 +241,8 @@ do_search_threads (const void *ctx,
 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;
@@ -259,7 +261,13 @@ do_search_messages (const void *ctx,
 	if (! first_message)
 	    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;
 
@@ -363,6 +371,8 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
 		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 {
@@ -414,7 +424,8 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
 	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);
diff --git a/notmuch.1 b/notmuch.1
index 1919176e..53fa6ffc 100644
--- a/notmuch.1
+++ b/notmuch.1
@@ -182,6 +182,13 @@ either one per line (--format=text) or as a JSON array
 .RE
 .RS 4
 .TP 4
+.B files
+
+Output the filenames of all messages matching the search terms, either
+one per line (--format=text) or as a JSON array (--format=json).
+.RE
+.RS 4
+.TP 4
 .B tags
 
 Output all tags that appear on any message matching the search terms,
diff --git a/notmuch.c b/notmuch.c
index e92f14c5..1faed3e4 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -186,6 +186,12 @@ command_t commands[] = {
       "\t\tterms, either one per line (--format=text) or as a JSON array\n"
       "\t\t(--format=json).\n"
       "\n"
+      "\t\tfiles\n"
+      "\n"
+      "\t\tOutput the filenames of all messages matching the search\n"
+      "\t\tterms, either one per line (--format=text) or as a JSON array\n"
+      "\t\t(--format=json).\n"
+      "\n"
       "\t\ttags\n"
       "\n"
       "\t\tOutput all tags that appear on any message matching the search\n"