X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-show.c;h=edebacaa571a3ba44a089fa671300e71f8c530cb;hp=9f81ae161f1fa4975df8cf721630fbab818539c9;hb=3493ea0ed5bd20b961aafa01eeddaf8cbc49b52f;hpb=93dcc3b695e19dd36cc8f638c6e01ecbbd9a447d diff --git a/notmuch-show.c b/notmuch-show.c index 9f81ae16..edebacaa 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -67,11 +67,40 @@ _get_one_line_summary (void *ctx, notmuch_message_t *message) } static void -show_part(GMimeObject *part, int *part_count) +show_part_content (GMimeObject *part) +{ + GMimeStream *stream_stdout = g_mime_stream_file_new (stdout); + GMimeStream *stream_filter = NULL; + GMimeDataWrapper *wrapper; + const char *charset; + + charset = g_mime_object_get_content_type_parameter (part, "charset"); + + if (stream_stdout) { + g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE); + stream_filter = g_mime_stream_filter_new(stream_stdout); + g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter), + g_mime_filter_crlf_new(FALSE, FALSE)); + if (charset) { + g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter), + g_mime_filter_charset_new(charset, "UTF-8")); + } + } + + wrapper = g_mime_part_get_content_object (GMIME_PART (part)); + if (wrapper && stream_filter) + g_mime_data_wrapper_write_to_stream (wrapper, stream_filter); + if (stream_filter) + g_object_unref(stream_filter); + if (stream_stdout) + g_object_unref(stream_stdout); +} + +static void +show_part (GMimeObject *part, int *part_count) { GMimeContentDisposition *disposition; GMimeContentType *content_type; - GMimeDataWrapper *wrapper; disposition = g_mime_object_get_content_disposition (part); if (disposition && @@ -85,6 +114,13 @@ show_part(GMimeObject *part, int *part_count) g_mime_content_type_to_string (content_type)); printf ("Attachment: %s (%s)\n", filename, 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")) + { + show_part_content (part); + } + printf ("\fattachment}\n"); return; @@ -99,14 +135,7 @@ show_part(GMimeObject *part, int *part_count) if (g_mime_content_type_is_type (content_type, "text", "*") && !g_mime_content_type_is_type (content_type, "text", "html")) { - GMimeStream *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 && stream) - g_mime_data_wrapper_write_to_stream (wrapper, stream); - if (stream) - g_object_unref(stream); + show_part_content (part); } else { @@ -117,73 +146,113 @@ show_part(GMimeObject *part, int *part_count) printf ("\fpart}\n"); } +static void +show_message (void *ctx, notmuch_message_t *message, int indent) +{ + const char *headers[] = { + "Subject", "From", "To", "Cc", "Bcc", "Date" + }; + const char *name, *value; + unsigned int i; + + printf ("\fmessage{ id:%s depth:%d filename:%s\n", + notmuch_message_get_message_id (message), + indent, + notmuch_message_get_filename (message)); + + printf ("\fheader{\n"); + + printf ("%s\n", _get_one_line_summary (ctx, message)); + + for (i = 0; i < ARRAY_SIZE (headers); i++) { + name = headers[i]; + value = notmuch_message_get_header (message, name); + if (value) + printf ("%s: %s\n", name, value); + } + + printf ("\fheader}\n"); + printf ("\fbody{\n"); + + show_message_body (notmuch_message_get_filename (message), show_part); + + printf ("\fbody}\n"); + + printf ("\fmessage}\n"); +} + + +static void +show_messages (void *ctx, notmuch_messages_t *messages, int indent) +{ + notmuch_message_t *message; + + for (; + notmuch_messages_has_more (messages); + notmuch_messages_advance (messages)) + { + message = notmuch_messages_get (messages); + + show_message (ctx, message, indent); + + show_messages (ctx, notmuch_message_get_replies (message), indent + 1); + + notmuch_message_destroy (message); + } +} + int notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) { notmuch_config_t *config; notmuch_database_t *notmuch; notmuch_query_t *query; + notmuch_threads_t *threads; + notmuch_thread_t *thread; notmuch_messages_t *messages; - notmuch_message_t *message; char *query_string; - const char *headers[] = { - "Subject", "From", "To", "Cc", "Bcc", "Date" - }; - const char *name, *value; - unsigned int i; - config = notmuch_config_open (ctx, NULL, NULL); if (config == NULL) return 1; - notmuch = notmuch_database_open (notmuch_config_get_database_path (config)); - if (notmuch == NULL) - return 1; - query_string = query_string_from_args (ctx, argc, argv); if (query_string == NULL) { fprintf (stderr, "Out of memory\n"); return 1; } + if (*query_string == '\0') { + fprintf (stderr, "Error: notmuch show requires at least one search term.\n"); + return 1; + } + + notmuch = notmuch_database_open (notmuch_config_get_database_path (config), + NOTMUCH_DATABASE_MODE_READ_ONLY); + if (notmuch == NULL) + return 1; + query = notmuch_query_create (notmuch, query_string); if (query == NULL) { fprintf (stderr, "Out of memory\n"); return 1; } - for (messages = notmuch_query_search_messages (query, 0, -1); - notmuch_messages_has_more (messages); - notmuch_messages_advance (messages)) + for (threads = notmuch_query_search_threads (query); + notmuch_threads_has_more (threads); + notmuch_threads_advance (threads)) { - message = notmuch_messages_get (messages); - - printf ("\fmessage{ id:%s filename:%s\n", - notmuch_message_get_message_id (message), - notmuch_message_get_filename (message)); - - printf ("\fheader{\n"); - - printf ("%s\n", _get_one_line_summary (ctx, message)); + thread = notmuch_threads_get (threads); - for (i = 0; i < ARRAY_SIZE (headers); i++) { - name = headers[i]; - value = notmuch_message_get_header (message, name); - if (value) - printf ("%s: %s\n", name, value); - } - - printf ("\fheader}\n"); - printf ("\fbody{\n"); + messages = notmuch_thread_get_toplevel_messages (thread); - show_message_body (notmuch_message_get_filename (message), show_part); + if (messages == NULL) + INTERNAL_ERROR ("Thread %s has no toplevel messages.\n", + notmuch_thread_get_thread_id (thread)); - printf ("\fbody}\n"); + show_messages (ctx, messages, 0); - printf ("\fmessage}\n"); - - notmuch_message_destroy (message); + notmuch_thread_destroy (thread); } notmuch_query_destroy (query);