message: add flags to notmuch_message_t

[notmuch] / notmuch-show.c

diff --git a/notmuch-show.c b/notmuch-show.c
index a3f354edb6816c0b1b41038759a795b8da626db0..edebacaa571a3ba44a089fa671300e71f8c530cb 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -66,12 +66,41 @@ _get_one_line_summary (void *ctx, notmuch_message_t *message)
                            from, relative_date, tags);
 }
 
+static void
+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
     {
@@ -187,23 +216,29 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     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 (threads = notmuch_query_search_threads (query, 0, -1);
+    for (threads = notmuch_query_search_threads (query);
         notmuch_threads_has_more (threads);
         notmuch_threads_advance (threads))
     {