X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=c5a913cdec7329f71813ec1dc03d1135bcc39c27;hp=718aec9a66e7c9b6927d488d99e278949475261f;hb=494c74229bb8bdfc8571ce5de20a7beb0333c5f2;hpb=9c6a01067457a8115300339568b57c8ff2e6a578

diff --git a/notmuch.c b/notmuch.c
index 718aec9a..c5a913cd 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -850,7 +850,7 @@ search_command (void *ctx, int argc, char *argv[])
 	date = notmuch_thread_get_oldest_date (thread);
 	relative_date = _format_relative_date (local, date);
 
-	printf ("%s %12s %s",
+	printf ("thread:%s %12s %s",
 		notmuch_thread_get_thread_id (thread),
 		relative_date,
 		notmuch_thread_get_subject (thread));
@@ -880,6 +880,32 @@ search_command (void *ctx, int argc, char *argv[])
     return ret;
 }
 
+static const char *
+_get_tags_as_string (void *ctx, notmuch_message_t *message)
+{
+    notmuch_tags_t *tags;
+    int first = 1;
+    const char *tag;
+    char *result;
+
+    result = talloc_strdup (ctx, "");
+    if (result == NULL)
+	return NULL;
+
+    for (tags = notmuch_message_get_tags (message);
+	 notmuch_tags_has_more (tags);
+	 notmuch_tags_advance (tags))
+    {
+	tag = notmuch_tags_get (tags);
+
+	result = talloc_asprintf_append (result, "%s%s",
+					 first ? "" : " ", tag);
+	first = 0;
+    }
+
+    return result;
+}
+
 /* Get a nice, single-line summary of message. */
 static const char *
 _get_one_line_summary (void *ctx, notmuch_message_t *message)
@@ -888,6 +914,7 @@ _get_one_line_summary (void *ctx, notmuch_message_t *message)
     time_t date;
     const char *relative_date;
     const char *subject;
+    const char *tags;
 
     from = notmuch_message_get_header (message, "from");
 
@@ -896,8 +923,10 @@ _get_one_line_summary (void *ctx, notmuch_message_t *message)
 
     subject = notmuch_message_get_header (message, "subject");
 
-    return talloc_asprintf (ctx, "%s (%s) %s",
-			    from, relative_date, subject);
+    tags = _get_tags_as_string (ctx, message);
+
+    return talloc_asprintf (ctx, "%s (%s) %s (%s)",
+			    from, relative_date, subject, tags);
 }
 
 static void
@@ -977,6 +1006,8 @@ show_message_part (GMimeObject *part, int *part_count)
 	wrapper = g_mime_part_get_content_object (GMIME_PART (part));
 	if (wrapper)
 	    g_mime_data_wrapper_write_to_stream (wrapper, stream);
+
+	g_object_unref (stream);
     }
     else
     {
@@ -985,8 +1016,6 @@ show_message_part (GMimeObject *part, int *part_count)
     }
 
     printf ("\fpart}\n");
-
-    g_object_unref (stream);
 }
 
 static notmuch_status_t
@@ -1038,25 +1067,6 @@ show_message_body (const char *filename)
     return ret;
 }
 
-static int
-_message_is_unread (notmuch_message_t *message)
-{
-    notmuch_tags_t *tags;
-    const char *tag;
-
-    for (tags = notmuch_message_get_tags (message);
-	 notmuch_tags_has_more (tags);
-	 notmuch_tags_advance (tags))
-    {
-	tag = notmuch_tags_get (tags);
-
-	if (strcmp (tag, "unread") == 0)
-	    return 1;
-    }
-
-    return 0;
-}
-
 static int
 show_command (void *ctx, unused (int argc), unused (char *argv[]))
 {
@@ -1067,7 +1077,6 @@ show_command (void *ctx, unused (int argc), unused (char *argv[]))
     notmuch_messages_t *messages;
     notmuch_message_t *message;
     int ret = 0;
-    int unread;
 
     const char *headers[] = {
 	"Subject", "From", "To", "Cc", "Bcc", "Date"
@@ -1075,19 +1084,13 @@ show_command (void *ctx, unused (int argc), unused (char *argv[]))
     const char *name, *value;
     unsigned int i;
 
-    if (argc != 1) {
-	fprintf (stderr, "Error: \"notmuch show\" requires exactly one thread-ID argument.\n");
-	ret = 1;
-	goto DONE;
-    }
-
     notmuch = notmuch_database_open (NULL);
     if (notmuch == NULL) {
 	ret = 1;
 	goto DONE;
     }
 
-    query_string = talloc_asprintf (local, "thread:%s", argv[0]);
+    query_string = query_string_from_args (local, argc, argv);
     if (query_string == NULL) {
 	fprintf (stderr, "Out of memory\n");
 	ret = 1;
@@ -1106,11 +1109,10 @@ show_command (void *ctx, unused (int argc), unused (char *argv[]))
 	 notmuch_messages_advance (messages))
     {
 	message = notmuch_messages_get (messages);
-	unread = _message_is_unread (message);
 
-	printf ("\fmessage{ ID: %s %s\n",
+	printf ("\fmessage{ id:%s filename:%s\n",
 		notmuch_message_get_message_id (message),
-		unread ? "unread" : "");
+		notmuch_message_get_filename (message));
 
 	printf ("\fheader{\n");
 
@@ -1488,11 +1490,22 @@ command_t commands[] = {
       "\t\tinterpretation by the shell, (such as by putting quotation\n"
       "\t\tmarks around any parenthesized expression)." },
     { "show", show_command,
-      "<thread-id>\n\n"
-      "\t\tShow the thread with the given thread ID (see 'search').",
-      "\t\tThread ID values are given as the first column in the\n"
-      "\t\toutput of the \"notmuch search\" command. These are the\n"
-      "\t\trandom-looking strings of 32 characters." },
+      "<search-terms> [...]\n\n"
+      "\t\tShows all messages matching the search terms.",
+      "\t\tSee the documentation of \"notmuch search\" for details\n"
+      "\t\tof the supported syntax of search terms.\n\n"
+      "\t\tA common use of \"notmuch show\" is to display a single\n"
+      "\t\tthread of email messages. For this, use a search term of\n"
+      "\t\t\"thread:<thread-id>\" as can be seen in the first column\n"
+      "\t\tof output from the \"notmuch search\" command.\n\n"
+      "\t\tAll messages will be displayed in date order. The output\n"
+      "\t\tformat is plain-text, with all text-content MIME parts\n"
+      "\t\tdecoded. Various components in the output, ('message',\n"
+      "\t\t'header', 'body', 'attachment', and MIME 'part') will be\n"
+      "\t\tdelimited by easily-parsed markers. Each marker consists\n"
+      "\t\tof a Control-L character (ASCII decimal 12), the name of\n"
+      "\t\tthe marker, and then either an opening or closing brace,\n"
+      "\t\t'{' or '}' to either open or close the component."},
     { "tag", tag_command,
       "+<tag>|-<tag> [...] [--] <search-term> [...]\n\n"
       "\t\tAdd/remove tags for all messages matching the search terms.",