X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=3b4cd6f13a40f5c586cd1f2e85e16e5ab833e29d;hp=7ee1d6bc0d4aa3258a203fe56d5b720a7f752d25;hb=aa34eb2a3761c770b485486d0f94564f5e925128;hpb=a2f0445e1b302e2559e48851775dc792ce3c6904

diff --git a/notmuch.c b/notmuch.c
index 7ee1d6bc..3b4cd6f1 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -23,6 +23,8 @@
 #endif
 #include <stdio.h>
 
+#include <gmime/gmime.h>
+
 #include "notmuch.h"
 
 /* This is separate from notmuch-private.h because we're trying to
@@ -60,7 +62,7 @@
 
 #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
 
-typedef int (*command_function_t) (int argc, char *argv[]);
+typedef int (*command_function_t) (void *ctx, int argc, char *argv[]);
 
 typedef struct command {
     const char *name;
@@ -471,7 +473,7 @@ count_files (const char *path, int *count)
 }
 
 static int
-setup_command (unused (int argc), unused (char *argv[]))
+setup_command (unused (void *ctx), unused (int argc), unused (char *argv[]))
 {
     notmuch_database_t *notmuch = NULL;
     char *default_path, *mail_directory = NULL;
@@ -629,7 +631,7 @@ tag_inbox_and_unread (notmuch_message_t *message)
 }
 
 static int
-new_command (unused (int argc), unused (char *argv[]))
+new_command (unused (void *ctx), unused (int argc), unused (char *argv[]))
 {
     notmuch_database_t *notmuch;
     const char *mail_directory;
@@ -737,11 +739,11 @@ query_string_from_args (void *ctx, int argc, char *argv[])
  *
  * Examples include:
  *
- *	5 minutes ago	(For times less than 60 minutes ago)
- *	12:30		(For times >60 minutes but still today)
- *	Yesterday
- *	Monday		(Before yesterday but fewer than 7 days ago)
- *	Oct. 12		(Between 7 and 180 days ago (about 6 months))
+ *	5 mins. ago	(For times less than 60 minutes ago)
+ *	Today 12:30	(For times >60 minutes but still today)
+ *	Yest. 12:30
+ *	Mon.  12:30	(Before yesterday but fewer than 7 days ago)
+ *	October 12	(Between 7 and 180 days ago (about 6 months))
  *	2008-06-30	(More than 180 days ago)
  */
 #define MINUTE (60)
@@ -776,7 +778,7 @@ _format_relative_date (void *ctx, time_t then)
 
     if (delta < 3600) {
 	snprintf (result, RELATIVE_DATE_MAX,
-		  "%d minutes ago", (int) (delta / 60));
+		  "%d mins. ago", (int) (delta / 60));
 	return result;
     }
 
@@ -785,21 +787,23 @@ _format_relative_date (void *ctx, time_t then)
 	    delta < DAY)
 	{
 	    strftime (result, RELATIVE_DATE_MAX,
-		      "%R", &tm_then); /* 12:30 */
+		      "Today %R", &tm_then); /* Today 12:30 */
 	    return result;
 	} else if ((tm_now.tm_wday + 7 - tm_then.tm_wday) % 7 == 1) {
-	    return "Yesterday";
+	    strftime (result, RELATIVE_DATE_MAX,
+		      "Yest. %R", &tm_then); /* Yest. 12:30 */
+	    return result;
 	} else {
 	    if (tm_then.tm_wday != tm_now.tm_wday) {
 		strftime (result, RELATIVE_DATE_MAX,
-			  "%A", &tm_then); /* Monday */
+			  "%a. %R", &tm_then); /* Mon. 12:30 */
 		return result;
 	    }
 	}
     }
 
     strftime (result, RELATIVE_DATE_MAX,
-	      "%b %d", &tm_then); /* Oct. 12 */
+	      "%B %d", &tm_then); /* October 12 */
     return result;
 }
 #undef MINUTE
@@ -807,12 +811,12 @@ _format_relative_date (void *ctx, time_t then)
 #undef DAY
 
 static int
-search_command (int argc, char *argv[])
+search_command (void *ctx, int argc, char *argv[])
 {
-    void *local = talloc_new (NULL);
+    void *local = talloc_new (ctx);
     notmuch_database_t *notmuch = NULL;
     notmuch_query_t *query;
-    notmuch_thread_results_t *results;
+    notmuch_threads_t *threads;
     notmuch_thread_t *thread;
     notmuch_tags_t *tags;
     char *query_str;
@@ -835,18 +839,18 @@ search_command (int argc, char *argv[])
 	goto DONE;
     }
 
-    for (results = notmuch_query_search_threads (query);
-	 notmuch_thread_results_has_more (results);
-	 notmuch_thread_results_advance (results))
+    for (threads = notmuch_query_search_threads (query);
+	 notmuch_threads_has_more (threads);
+	 notmuch_threads_advance (threads))
     {
 	int first = 1;
 
-	thread = notmuch_thread_results_get (results);
+	thread = notmuch_threads_get (threads);
 
 	date = notmuch_thread_get_oldest_date (thread);
 	relative_date = _format_relative_date (local, date);
 
-	printf ("%s (%s) %s",
+	printf ("%s %12s %s",
 		notmuch_thread_get_thread_id (thread),
 		relative_date,
 		notmuch_thread_get_subject (thread));
@@ -876,6 +880,32 @@ search_command (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)
@@ -884,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");
 
@@ -892,23 +923,160 @@ _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
+show_message_part (GMimeObject *part, int *part_count)
+{
+    GMimeStream *stream;
+    GMimeDataWrapper *wrapper;
+    GMimeContentDisposition *disposition;
+    GMimeContentType *content_type;
+
+    *part_count = *part_count + 1;
+
+    if (GMIME_IS_MULTIPART (part)) {
+	GMimeMultipart *multipart = GMIME_MULTIPART (part);
+	int i;
+
+	for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
+	    if (GMIME_IS_MULTIPART_SIGNED (multipart)) {
+		/* Don't index the signature. */
+		if (i == 1)
+		    continue;
+		if (i > 1)
+		    fprintf (stderr, "Warning: Unexpected extra parts of mutlipart/signed. Continuing.\n");
+	    }
+	    show_message_part (g_mime_multipart_get_part (multipart, i),
+			       part_count);
+	}
+	return;
+    }
+
+    if (GMIME_IS_MESSAGE_PART (part)) {
+	GMimeMessage *mime_message;
+
+	mime_message = g_mime_message_part_get_message (GMIME_MESSAGE_PART (part));
+
+	show_message_part (g_mime_message_get_mime_part (mime_message),
+			   part_count);
+
+	return;
+    }
+
+    if (! (GMIME_IS_PART (part))) {
+	fprintf (stderr, "Warning: Not displaying unknown mime part: %s.\n",
+		 g_type_name (G_OBJECT_TYPE (part)));
+	return;
+    }
+
+    disposition = g_mime_object_get_content_disposition (part);
+    if (disposition &&
+	strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
+    {
+	const char *filename = g_mime_part_get_filename (GMIME_PART (part));
+	content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
+
+	printf ("\fattachment{ ID: %d, Content-type: %s\n",
+		*part_count,
+		g_mime_content_type_to_string (content_type));
+	printf ("Attachment: %s (%s)\n", filename,
+		g_mime_content_type_to_string (content_type));
+	printf ("\fattachment}\n");
+
+	return;
+    }
+
+    content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
+
+    printf ("\fpart{ ID: %d, Content-type: %s\n",
+	    *part_count,
+	    g_mime_content_type_to_string (content_type));
+
+    if (g_mime_content_type_is_type (content_type, "text", "*") &&
+	!g_mime_content_type_is_type (content_type, "text", "html"))
+    {
+	stream = g_mime_stream_file_new (stdout);
+	g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream), FALSE);
+
+	wrapper = g_mime_part_get_content_object (GMIME_PART (part));
+	if (wrapper)
+	    g_mime_data_wrapper_write_to_stream (wrapper, stream);
+    }
+    else
+    {
+	printf ("Non-text part: %s\n",
+		g_mime_content_type_to_string (content_type));
+    }
+
+    printf ("\fpart}\n");
+
+    g_object_unref (stream);
+}
+
+static notmuch_status_t
+show_message_body (const char *filename)
+{
+    GMimeStream *stream = NULL;
+    GMimeParser *parser = NULL;
+    GMimeMessage *mime_message = NULL;
+    notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
+    static int initialized = 0;
+    FILE *file = NULL;
+    int part_count = 0;
+
+    if (! initialized) {
+	g_mime_init (0);
+	initialized = 1;
+    }
+
+    file = fopen (filename, "r");
+    if (! file) {
+	fprintf (stderr, "Error opening %s: %s\n", filename, strerror (errno));
+	ret = NOTMUCH_STATUS_FILE_ERROR;
+	goto DONE;
+    }
+
+    stream = g_mime_stream_file_new (file);
+    g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream), FALSE);
+
+    parser = g_mime_parser_new_with_stream (stream);
+
+    mime_message = g_mime_parser_construct_message (parser);
+
+    show_message_part (g_mime_message_get_mime_part (mime_message),
+		       &part_count);
+
+  DONE:
+    if (mime_message)
+	g_object_unref (mime_message);
+
+    if (parser)
+	g_object_unref (parser);
+
+    if (stream)
+	g_object_unref (stream);
+
+    if (file)
+	fclose (file);
+
+    return ret;
 }
 
 static int
-show_command (unused (int argc), unused (char *argv[]))
+show_command (void *ctx, unused (int argc), unused (char *argv[]))
 {
-    void *local = talloc_new (NULL);
+    void *local = talloc_new (ctx);
     char *query_string;
     notmuch_database_t *notmuch = NULL;
     notmuch_query_t *query = NULL;
-    notmuch_message_results_t *messages;
+    notmuch_messages_t *messages;
     notmuch_message_t *message;
-    const char *filename;
-    FILE *file;
     int ret = 0;
-    int c;
 
     const char *headers[] = {
 	"Subject", "From", "To", "Cc", "Bcc", "Date"
@@ -943,14 +1111,15 @@ show_command (unused (int argc), unused (char *argv[]))
     }
 
     for (messages = notmuch_query_search_messages (query);
-	 notmuch_message_results_has_more (messages);
-	 notmuch_message_results_advance (messages))
+	 notmuch_messages_has_more (messages);
+	 notmuch_messages_advance (messages))
     {
-	message = notmuch_message_results_get (messages);
+	message = notmuch_messages_get (messages);
 
-	printf ("%%message{\n");
+	printf ("\fmessage{ ID: %s\n",
+		notmuch_message_get_message_id (message));
 
-	printf ("%%header{\n");
+	printf ("\fheader{\n");
 
 	printf ("%s\n", _get_one_line_summary (local, message));
 
@@ -961,24 +1130,14 @@ show_command (unused (int argc), unused (char *argv[]))
 		printf ("%s: %s\n", name, value);
 	}
 
-	printf ("%%header}\n");
+	printf ("\fheader}\n");
+	printf ("\fbody{\n");
 
-	filename = notmuch_message_get_filename (message);
+	show_message_body (notmuch_message_get_filename (message));
 
-	file = fopen (filename, "r");
-	if (file) {
-	    size_t header_size = notmuch_message_get_header_size (message);
-	    fseek (file, header_size + 1, SEEK_SET);
-	    while (1) {
-		c = fgetc (file);
-		if (c == EOF)
-		    break;
-		putchar (c);
-	    }
-	}
-	fclose (file);
+	printf ("\fbody}\n");
 
-	printf ("%%message}\n");
+	printf ("\fmessage}\n");
 
 	notmuch_message_destroy (message);
     }
@@ -997,7 +1156,7 @@ show_command (unused (int argc), unused (char *argv[]))
 }
 
 static int
-tag_command (unused (int argc), unused (char *argv[]))
+tag_command (void *ctx, unused (int argc), unused (char *argv[]))
 {
     void *local;
     int *add_tags, *remove_tags;
@@ -1006,12 +1165,12 @@ tag_command (unused (int argc), unused (char *argv[]))
     char *query_string;
     notmuch_database_t *notmuch = NULL;
     notmuch_query_t *query;
-    notmuch_message_results_t *results;
+    notmuch_messages_t *messages;
     notmuch_message_t *message;
     int ret = 0;
     int i;
 
-    local = talloc_new (NULL);
+    local = talloc_new (ctx);
     if (local == NULL) {
 	ret = 1;
 	goto DONE;
@@ -1070,11 +1229,11 @@ tag_command (unused (int argc), unused (char *argv[]))
 	goto DONE;
     }
 
-    for (results = notmuch_query_search_messages (query);
-	 notmuch_message_results_has_more (results);
-	 notmuch_message_results_advance (results))
+    for (messages = notmuch_query_search_messages (query);
+	 notmuch_messages_has_more (messages);
+	 notmuch_messages_advance (messages))
     {
-	message = notmuch_message_results_get (results);
+	message = notmuch_messages_get (messages);
 
 	notmuch_message_freeze (message);
 
@@ -1102,12 +1261,12 @@ tag_command (unused (int argc), unused (char *argv[]))
 }
 
 static int
-dump_command (int argc, char *argv[])
+dump_command (unused (void *ctx), int argc, char *argv[])
 {
     FILE *output = NULL;
     notmuch_database_t *notmuch = NULL;
     notmuch_query_t *query;
-    notmuch_message_results_t *results;
+    notmuch_messages_t *messages;
     notmuch_message_t *message;
     notmuch_tags_t *tags;
     int ret = 0;
@@ -1139,12 +1298,12 @@ dump_command (int argc, char *argv[])
 
     notmuch_query_set_sort (query, NOTMUCH_SORT_MESSAGE_ID);
 
-    for (results = notmuch_query_search_messages (query);
-	 notmuch_message_results_has_more (results);
-	 notmuch_message_results_advance (results))
+    for (messages = notmuch_query_search_messages (query);
+	 notmuch_messages_has_more (messages);
+	 notmuch_messages_advance (messages))
     {
 	int first = 1;
-	message = notmuch_message_results_get (results);
+	message = notmuch_messages_get (messages);
 
 	fprintf (output,
 		 "%s (", notmuch_message_get_message_id (message));
@@ -1178,7 +1337,7 @@ dump_command (int argc, char *argv[])
 }
 
 static int
-restore_command (int argc, char *argv[])
+restore_command (unused (void *ctx), int argc, char *argv[])
 {
     FILE *input = NULL;
     notmuch_database_t *notmuch = NULL;
@@ -1287,7 +1446,7 @@ restore_command (int argc, char *argv[])
 }
 
 static int
-help_command (int argc, char *argv[]);
+help_command (void *ctx, int argc, char *argv[]);
 
 command_t commands[] = {
     { "setup", setup_command,
@@ -1305,7 +1464,7 @@ command_t commands[] = {
       "\t\t\"inbox\" and \"unread\".\n"
       "\n"
       "\t\tNote: \"notmuch new\" will skip any read-only directories,\n"
-      "\t\tso you can use that to mark tdirectories that will not\n"
+      "\t\tso you can use that to mark directories that will not\n"
       "\t\treceive any new mail (and make \"notmuch new\" faster)." },
     { "search", search_command,
       "<search-term> [...]\n\n"
@@ -1404,7 +1563,7 @@ usage (void)
 }
 
 static int
-help_command (int argc, char *argv[])
+help_command (unused (void *ctx), int argc, char *argv[])
 {
     command_t *command;
     unsigned int i;
@@ -1435,23 +1594,26 @@ help_command (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
+    void *local = talloc_new (NULL);
     command_t *command;
     unsigned int i;
 
     if (argc == 1)
-	return setup_command (0, NULL);
+	return setup_command (local, 0, NULL);
 
     for (i = 0; i < ARRAY_SIZE (commands); i++) {
 	command = &commands[i];
 
 	if (strcmp (argv[1], command->name) == 0)
-	    return (command->function) (argc - 2, &argv[2]);
+	    return (command->function) (local, argc - 2, &argv[2]);
     }
 
     /* Don't complain about "help" being an unknown command when we're
        about to provide exactly what's wanted anyway. */
-    fprintf (stderr, "Error: Unknown command '%s'\n\n", argv[1]);
-    usage ();
+    fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",
+	     argv[1]);
+
+    talloc_free (local);
 
     return 1;
 }