X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-show.c;h=27587f8799291d79e5a47342beb7bea3226202fc;hp=76873a1d9036337868811659c99bb105ad371dfe;hb=5a9d5f2f149b4c3122e2796e782c13a32571696b;hpb=8cbb5114a20c1217f23977fd5edca99a0b7a2955 diff --git a/notmuch-show.c b/notmuch-show.c index 76873a1d..27587f87 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -20,25 +20,6 @@ #include "notmuch-client.h" -typedef struct show_format { - const char *message_set_start; - const char *message_start; - void (*message) (const void *ctx, - notmuch_message_t *message, - int indent); - const char *header_start; - void (*header) (const void *ctx, - notmuch_message_t *message); - const char *header_end; - const char *body_start; - void (*part) (GMimeObject *part, - int *part_count); - const char *body_end; - const char *message_end; - const char *message_set_sep; - const char *message_set_end; -} show_format_t; - static void format_message_text (unused (const void *ctx), notmuch_message_t *message, @@ -46,14 +27,19 @@ format_message_text (unused (const void *ctx), static void format_headers_text (const void *ctx, notmuch_message_t *message); + static void format_part_text (GMimeObject *part, int *part_count); -static const show_format_t format_text = { + +static void +format_part_end_text (GMimeObject *part); + +static const notmuch_show_format_t format_text = { "", "\fmessage{ ", format_message_text, "\fheader{\n", format_headers_text, "\fheader}\n", - "\fbody{\n", format_part_text, "\fbody}\n", + "\fbody{\n", format_part_text, format_part_end_text, "", "\fbody}\n", "\fmessage}\n", "", "" }; @@ -65,18 +51,37 @@ format_message_json (const void *ctx, static void format_headers_json (const void *ctx, notmuch_message_t *message); + static void format_part_json (GMimeObject *part, int *part_count); -static const show_format_t format_json = { + +static void +format_part_end_json (GMimeObject *part); + +static const notmuch_show_format_t format_json = { "[", "{", format_message_json, ", \"headers\": {", format_headers_json, "}", - ", \"body\": [", format_part_json, "]", + ", \"body\": [", format_part_json, format_part_end_json, ", ", "]", "}", ", ", "]" }; +static void +format_message_mbox (const void *ctx, + notmuch_message_t *message, + unused (int indent)); + +static const notmuch_show_format_t format_mbox = { + "", + "", format_message_mbox, + "", NULL, "", + "", NULL, NULL, "", "", + "", "", + "" +}; + static const char * _get_tags_as_string (const void *ctx, notmuch_message_t *message) { @@ -145,7 +150,7 @@ format_message_json (const void *ctx, notmuch_message_t *message, unused (int in date = notmuch_message_get_date (message); relative_date = notmuch_time_relative_date (ctx, date); - printf ("\"id\": %s, \"match\": %s, \"filename\": %s, \"date_unix\": %ld, \"date_relative\": \"%s\", \"tags\": [", + printf ("\"id\": %s, \"match\": %s, \"filename\": %s, \"timestamp\": %ld, \"date_relative\": \"%s\", \"tags\": [", json_quote_str (ctx_quote, notmuch_message_get_message_id (message)), notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH) ? "true" : "false", json_quote_str (ctx_quote, notmuch_message_get_filename (message)), @@ -163,6 +168,112 @@ format_message_json (const void *ctx, notmuch_message_t *message, unused (int in talloc_free (ctx_quote); } +/* Extract just the email address from the contents of a From: + * header. */ +static const char * +_extract_email_address (const void *ctx, const char *from) +{ + InternetAddressList *addresses; + InternetAddress *address; + InternetAddressMailbox *mailbox; + const char *email = "MAILER-DAEMON"; + + addresses = internet_address_list_parse_string (from); + + /* Bail if there is no address here. */ + if (addresses == NULL || internet_address_list_length (addresses) < 1) + goto DONE; + + /* Otherwise, just use the first address. */ + address = internet_address_list_get_address (addresses, 0); + + /* The From header should never contain an address group rather + * than a mailbox. So bail if it does. */ + if (! INTERNET_ADDRESS_IS_MAILBOX (address)) + goto DONE; + + mailbox = INTERNET_ADDRESS_MAILBOX (address); + email = internet_address_mailbox_get_addr (mailbox); + email = talloc_strdup (ctx, email); + + DONE: + /* XXX: How to free addresses here? */ + return email; + } + +/* Return 1 if 'line' is an mbox From_ line---that is, a line + * beginning with zero or more '>' characters followed by the + * characters 'F', 'r', 'o', 'm', and space. + * + * Any characters at all may appear after that in the line. + */ +static int +_is_from_line (const char *line) +{ + const char *s = line; + + if (line == NULL) + return 0; + + while (*s == '>') + s++; + + if (STRNCMP_LITERAL (s, "From ") == 0) + return 1; + else + return 0; +} + +/* Print a message in "mboxrd" format as documented, for example, + * here: + * + * http://qmail.org/qmail-manual-html/man5/mbox.html + */ +static void +format_message_mbox (const void *ctx, + notmuch_message_t *message, + unused (int indent)) +{ + const char *filename; + FILE *file; + const char *from; + + time_t date; + struct tm date_gmtime; + char date_asctime[26]; + + char *line = NULL; + size_t line_size; + ssize_t line_len; + + filename = notmuch_message_get_filename (message); + file = fopen (filename, "r"); + if (file == NULL) { + fprintf (stderr, "Failed to open %s: %s\n", + filename, strerror (errno)); + return; + } + + from = notmuch_message_get_header (message, "from"); + from = _extract_email_address (ctx, from); + + date = notmuch_message_get_date (message); + gmtime_r (&date, &date_gmtime); + asctime_r (&date_gmtime, date_asctime); + + printf ("From %s %s", from, date_asctime); + + while ((line_len = getline (&line, &line_size, file)) != -1 ) { + if (_is_from_line (line)) + putchar ('>'); + printf ("%s", line); + } + + printf ("\n"); + + fclose (file); +} + static void format_headers_text (const void *ctx, notmuch_message_t *message) { @@ -221,13 +332,19 @@ show_part_content (GMimeObject *part, GMimeStream *stream_out) charset = g_mime_object_get_content_type_parameter (part, "charset"); if (stream_out) { - stream_filter = g_mime_stream_filter_new(stream_out); - g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter), - g_mime_filter_crlf_new(FALSE, FALSE)); + stream_filter = g_mime_stream_filter_new (stream_out); + 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")); - } + GMimeFilter *charset_filter; + charset_filter = g_mime_filter_charset_new (charset, "UTF-8"); + /* This result can be NULL for things like "unknown-8bit". + * Don't set a NULL filter as that makes GMime print + * annoying assertion-failure messages on stderr. */ + if (charset_filter) + g_mime_stream_filter_add (GMIME_STREAM_FILTER (stream_filter), + charset_filter); + } } wrapper = g_mime_part_get_content_object (GMIME_PART (part)); @@ -265,8 +382,6 @@ format_part_text (GMimeObject *part, int *part_count) g_object_unref(stream_stdout); } - printf ("\fattachment}\n"); - return; } @@ -284,13 +399,33 @@ format_part_text (GMimeObject *part, int *part_count) show_part_content (part, stream_stdout); g_object_unref(stream_stdout); } + else if (g_mime_content_type_is_type (content_type, "multipart", "*")) + { + /* Do nothing for multipart since its content will be printed + * when recursing. */ + } else { printf ("Non-text part: %s\n", g_mime_content_type_to_string (content_type)); } +} + +static void +format_part_end_text (GMimeObject *part) +{ + GMimeContentDisposition *disposition; - printf ("\fpart}\n"); + disposition = g_mime_object_get_content_disposition (part); + if (disposition && + strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) + { + printf ("\fattachment}\n"); + } + else + { + printf ("\fpart}\n"); + } } static void @@ -301,16 +436,19 @@ format_part_json (GMimeObject *part, int *part_count) void *ctx = talloc_new (NULL); GMimeStream *stream_memory = g_mime_stream_mem_new (); GByteArray *part_content; + const char *cid; content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); - if (*part_count > 1) - fputs (", ", stdout); - printf ("{\"id\": %d, \"content-type\": %s", *part_count, json_quote_str (ctx, g_mime_content_type_to_string (content_type))); + cid = g_mime_object_get_content_id (part); + if (cid != NULL) + printf(", \"content-id\": %s", + json_quote_str (ctx, cid)); + disposition = g_mime_object_get_content_disposition (part); if (disposition && strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) @@ -328,8 +466,10 @@ format_part_json (GMimeObject *part, int *part_count) printf (", \"content\": %s", json_quote_chararray (ctx, (char *) part_content->data, part_content->len)); } - - fputs ("}", stdout); + else if (g_mime_content_type_is_type (content_type, "multipart", "*")) + { + printf (", \"content\": ["); + } talloc_free (ctx); if (stream_memory) @@ -337,7 +477,23 @@ format_part_json (GMimeObject *part, int *part_count) } static void -show_message (void *ctx, const show_format_t *format, notmuch_message_t *message, int indent) +format_part_end_json (GMimeObject *part) +{ + GMimeContentType *content_type; + + content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); + + if (g_mime_content_type_is_type (content_type, "multipart", "*")) + printf ("]"); + + printf ("}"); +} + +static void +show_message (void *ctx, + const notmuch_show_format_t *format, + notmuch_message_t *message, + int indent) { fputs (format->message_start, stdout); if (format->message) @@ -350,7 +506,8 @@ show_message (void *ctx, const show_format_t *format, notmuch_message_t *message fputs (format->body_start, stdout); if (format->part) - show_message_body (notmuch_message_get_filename (message), format->part); + show_message_body (notmuch_message_get_filename (message), + format); fputs (format->body_end, stdout); fputs (format->message_end, stdout); @@ -358,8 +515,11 @@ show_message (void *ctx, const show_format_t *format, notmuch_message_t *message static void -show_messages (void *ctx, const show_format_t *format, notmuch_messages_t *messages, int indent, - notmuch_bool_t entire_thread) +show_messages (void *ctx, + const notmuch_show_format_t *format, + notmuch_messages_t *messages, + int indent, + notmuch_show_params_t *params) { notmuch_message_t *message; notmuch_bool_t match; @@ -384,15 +544,18 @@ show_messages (void *ctx, const show_format_t *format, notmuch_messages_t *messa next_indent = indent; - if (match || entire_thread) { + if (match || params->entire_thread) { show_message (ctx, format, message, indent); next_indent = indent + 1; fputs (format->message_set_sep, stdout); } - show_messages (ctx, format, notmuch_message_get_replies (message), - next_indent, entire_thread); + show_messages (ctx, + format, + notmuch_message_get_replies (message), + next_indent, + params); notmuch_message_destroy (message); @@ -402,21 +565,116 @@ show_messages (void *ctx, const show_format_t *format, notmuch_messages_t *messa fputs (format->message_set_end, stdout); } +/* Formatted output of single message */ +static int +do_show_single (void *ctx, + notmuch_query_t *query, + const notmuch_show_format_t *format, + notmuch_show_params_t *params) +{ + notmuch_messages_t *messages; + notmuch_message_t *message; + + if (notmuch_query_count_messages (query) != 1) { + fprintf (stderr, "Error: search term did not match precisely one message.\n"); + return 1; + } + + messages = notmuch_query_search_messages (query); + message = notmuch_messages_get (messages); + + if (message == NULL) { + fprintf (stderr, "Error: Cannot find matching message.\n"); + return 1; + } + + /* Special case for --format=raw of full single message, just cat out file */ + if (params->raw) { + + const char *filename; + FILE *file; + size_t size; + char buf[4096]; + + filename = notmuch_message_get_filename (message); + if (filename == NULL) { + fprintf (stderr, "Error: Cannot message filename.\n"); + return 1; + } + + file = fopen (filename, "r"); + if (file == NULL) { + fprintf (stderr, "Error: Cannot open file %s: %s\n", filename, strerror (errno)); + return 1; + } + + while (!feof (file)) { + size = fread (buf, 1, sizeof (buf), file); + fwrite (buf, size, 1, stdout); + } + + fclose (file); + + } + + return 0; +} + +/* Formatted output of threads */ +static int +do_show (void *ctx, + notmuch_query_t *query, + const notmuch_show_format_t *format, + notmuch_show_params_t *params) +{ + notmuch_threads_t *threads; + notmuch_thread_t *thread; + notmuch_messages_t *messages; + int first_toplevel = 1; + + fputs (format->message_set_start, stdout); + + for (threads = notmuch_query_search_threads (query); + notmuch_threads_valid (threads); + notmuch_threads_move_to_next (threads)) + { + thread = notmuch_threads_get (threads); + + messages = notmuch_thread_get_toplevel_messages (thread); + + if (messages == NULL) + INTERNAL_ERROR ("Thread %s has no toplevel messages.\n", + notmuch_thread_get_thread_id (thread)); + + if (!first_toplevel) + fputs (format->message_set_sep, stdout); + first_toplevel = 0; + + show_messages (ctx, format, messages, 0, params); + + notmuch_thread_destroy (thread); + + } + + fputs (format->message_set_end, stdout); + + return 0; +} + 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; char *query_string; char *opt; - const show_format_t *format = &format_text; - int entire_thread = 0; + const notmuch_show_format_t *format = &format_text; + notmuch_show_params_t params; int i; - int first_toplevel = 1; + + params.entire_thread = 0; + params.raw = 0; for (i = 0; i < argc && argv[i][0] == '-'; i++) { if (strcmp (argv[i], "--") == 0) { @@ -429,13 +687,17 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) format = &format_text; } else if (strcmp (opt, "json") == 0) { format = &format_json; - entire_thread = 1; + params.entire_thread = 1; + } else if (strcmp (opt, "mbox") == 0) { + format = &format_mbox; + } else if (strcmp (opt, "raw") == 0) { + params.raw = 1; } else { fprintf (stderr, "Invalid value for --format: %s\n", opt); return 1; } } else if (STRNCMP_LITERAL (argv[i], "--entire-thread") == 0) { - entire_thread = 1; + params.entire_thread = 1; } else { fprintf (stderr, "Unrecognized option: %s\n", argv[i]); return 1; @@ -471,31 +733,12 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) return 1; } - fputs (format->message_set_start, stdout); - - for (threads = notmuch_query_search_threads (query); - notmuch_threads_valid (threads); - notmuch_threads_move_to_next (threads)) - { - thread = notmuch_threads_get (threads); - - messages = notmuch_thread_get_toplevel_messages (thread); - - if (messages == NULL) - INTERNAL_ERROR ("Thread %s has no toplevel messages.\n", - notmuch_thread_get_thread_id (thread)); - - if (!first_toplevel) - fputs (format->message_set_sep, stdout); - first_toplevel = 0; - - show_messages (ctx, format, messages, 0, entire_thread); - - notmuch_thread_destroy (thread); - - } - - fputs (format->message_set_end, stdout); + /* If --format=raw specified without specifying part, we can only + * output single message, so set part=0 */ + if (params.raw) + return do_show_single (ctx, query, format, ¶ms); + else + return do_show (ctx, query, format, ¶ms); notmuch_query_destroy (query); notmuch_database_close (notmuch);