From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id B632D429E28 for ; Sun, 5 Jun 2011 17:29:38 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -1.921 X-Spam-Level: X-Spam-Status: No, score=-1.921 tagged_above=-999 required=5 tests=[NO_DNS_FOR_FROM=0.379, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id huZ8Ajs5wmgg for ; Sun, 5 Jun 2011 17:29:38 -0700 (PDT) Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu [131.215.239.19]) by olra.theworths.org (Postfix) with ESMTP id C3E0C429E25 for ; Sun, 5 Jun 2011 17:29:37 -0700 (PDT) Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1]) by earth-doxen-postvirus (Postfix) with ESMTP id 1201A66E02C4; Sun, 5 Jun 2011 17:29:36 -0700 (PDT) X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new Received: from servo.finestructure.net (cpe-98-149-172-122.socal.res.rr.com [98.149.172.122]) (Authenticated sender: jrollins) by earth-doxen-submit (Postfix) with ESMTP id A7D7D66E027D; Sun, 5 Jun 2011 17:29:30 -0700 (PDT) Received: by servo.finestructure.net (Postfix, from userid 1000) id 23662AD8; Sun, 5 Jun 2011 17:29:31 -0700 (PDT) From: Jameson Graef Rollins To: Notmuch Mail Subject: [PATCH 4/5] Improve handling of message/rfc822 parts by adding a new header_message_part function to the formating structure. Date: Sun, 5 Jun 2011 17:29:28 -0700 Message-Id: <1307320169-29905-5-git-send-email-jrollins@finestructure.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1307320169-29905-4-git-send-email-jrollins@finestructure.net> References: <87sjrsi2b4.fsf@servo.factory.finestructure.net> <1307320169-29905-1-git-send-email-jrollins@finestructure.net> <1307320169-29905-2-git-send-email-jrollins@finestructure.net> <1307320169-29905-3-git-send-email-jrollins@finestructure.net> <1307320169-29905-4-git-send-email-jrollins@finestructure.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jun 2011 00:29:38 -0000 This new function takes a GMimeMessage as input, and outputs the formatted headers. This allows for message/rfc822 parts to be formatted on output in a similar way to full messages (see previous patch that overhauls the multipart test for more info). --- notmuch-client.h | 1 + notmuch-reply.c | 31 ++++++++++++++++++- notmuch-show.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++------- show-message.c | 12 +++++++ 4 files changed, 119 insertions(+), 13 deletions(-) diff --git a/notmuch-client.h b/notmuch-client.h index 63be337..b50cb38 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -63,6 +63,7 @@ typedef struct notmuch_show_format { const char *header_start; void (*header) (const void *ctx, notmuch_message_t *message); + void (*header_message_part) (GMimeMessage *message); const char *header_end; const char *body_start; void (*part_start) (GMimeObject *part, diff --git a/notmuch-reply.c b/notmuch-reply.c index 514bbc6..a19eb19 100644 --- a/notmuch-reply.c +++ b/notmuch-reply.c @@ -25,12 +25,15 @@ #include "gmime-filter-headers.h" static void +reply_headers_message_part (GMimeMessage *message); + +static void reply_part_content (GMimeObject *part); static const notmuch_show_format_t format_reply = { "", "", NULL, - "", NULL, "", + "", NULL, reply_headers_message_part, ">\n", "", NULL, NULL, @@ -63,6 +66,28 @@ show_reply_headers (GMimeMessage *message) } static void +reply_headers_message_part (GMimeMessage *message) +{ + InternetAddressList *recipients; + const char *recipients_string; + + printf ("> From: %s\n", g_mime_message_get_sender (message)); + recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO); + recipients_string = internet_address_list_to_string (recipients, 0); + if (recipients_string) + printf ("> To: %s\n", + recipients_string); + recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC); + recipients_string = internet_address_list_to_string (recipients, 0); + if (recipients_string) + printf ("> Cc: %s\n", + recipients_string); + printf ("> Subject: %s\n", g_mime_message_get_subject (message)); + printf ("> Date: %s\n", g_mime_message_get_date_as_string (message)); +} + + +static void reply_part_content (GMimeObject *part) { GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); @@ -95,6 +120,10 @@ reply_part_content (GMimeObject *part) if (stream_stdout) g_object_unref(stream_stdout); } + else if (g_mime_content_type_is_type (content_type, "message", "rfc822")) + { + /* Output nothing, since rfc822 subparts will be handled individually. */ + } else { if (disposition && diff --git a/notmuch-show.c b/notmuch-show.c index 0e9d00d..6e2e560 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -29,6 +29,9 @@ format_headers_text (const void *ctx, notmuch_message_t *message); static void +format_headers_message_part_text (GMimeMessage *message); + +static void format_part_start_text (GMimeObject *part, int *part_count); @@ -41,7 +44,7 @@ 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", + "\fheader{\n", format_headers_text, format_headers_message_part_text, "\fheader}\n", "\fbody{\n", format_part_start_text, NULL, @@ -63,6 +66,9 @@ format_headers_json (const void *ctx, notmuch_message_t *message); static void +format_headers_message_part_json (GMimeMessage *message); + +static void format_part_start_json (unused (GMimeObject *part), int *part_count); @@ -81,7 +87,7 @@ format_part_end_json (GMimeObject *part); static const notmuch_show_format_t format_json = { "[", "{", format_message_json, - ", \"headers\": {", format_headers_json, "}", + "\"headers\": {", format_headers_json, format_headers_message_part_json, "}", ", \"body\": [", format_part_start_json, format_part_encstatus_json, @@ -102,7 +108,7 @@ format_message_mbox (const void *ctx, static const notmuch_show_format_t format_mbox = { "", "", format_message_mbox, - "", NULL, "", + "", NULL, NULL, "", "", NULL, NULL, @@ -121,7 +127,7 @@ format_part_content_raw (GMimeObject *part); static const notmuch_show_format_t format_raw = { "", "", NULL, - "", NULL, "", + "", NULL, format_headers_message_part_text, "\n", "", NULL, NULL, @@ -216,7 +222,7 @@ format_message_json (const void *ctx, notmuch_message_t *message, unused (int in json_quote_str (ctx_quote, notmuch_tags_get (tags))); first = 0; } - printf("]"); + printf("], "); talloc_free (ctx_quote); } @@ -326,6 +332,7 @@ format_message_mbox (const void *ctx, fclose (file); } + static void format_headers_text (const void *ctx, notmuch_message_t *message) { @@ -346,6 +353,27 @@ format_headers_text (const void *ctx, notmuch_message_t *message) } static void +format_headers_message_part_text (GMimeMessage *message) +{ + InternetAddressList *recipients; + const char *recipients_string; + + printf ("From: %s\n", g_mime_message_get_sender (message)); + recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO); + recipients_string = internet_address_list_to_string (recipients, 0); + if (recipients_string) + printf ("To: %s\n", + recipients_string); + recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC); + recipients_string = internet_address_list_to_string (recipients, 0); + if (recipients_string) + printf ("Cc: %s\n", + recipients_string); + printf ("Subject: %s\n", g_mime_message_get_subject (message)); + printf ("Date: %s\n", g_mime_message_get_date_as_string (message)); +} + +static void format_headers_json (const void *ctx, notmuch_message_t *message) { const char *headers[] = { @@ -374,6 +402,40 @@ format_headers_json (const void *ctx, notmuch_message_t *message) talloc_free (ctx_quote); } +static void +format_headers_message_part_json (GMimeMessage *message) +{ + void *ctx = talloc_new (NULL); + void *ctx_quote = talloc_new (ctx); + InternetAddressList *recipients; + const char *recipients_string; + + printf ("%s: %s", + json_quote_str (ctx_quote, "From"), + json_quote_str (ctx_quote, g_mime_message_get_sender (message))); + recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO); + recipients_string = internet_address_list_to_string (recipients, 0); + if (recipients_string) + printf (", %s: %s", + json_quote_str (ctx_quote, "To"), + json_quote_str (ctx_quote, recipients_string)); + recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC); + recipients_string = internet_address_list_to_string (recipients, 0); + if (recipients_string) + printf (", %s: %s", + json_quote_str (ctx_quote, "Cc"), + json_quote_str (ctx_quote, recipients_string)); + printf (", %s: %s", + json_quote_str (ctx_quote, "Subject"), + json_quote_str (ctx_quote, g_mime_message_get_subject (message))); + printf (", %s: %s", + json_quote_str (ctx_quote, "Date"), + json_quote_str (ctx_quote, g_mime_message_get_date_as_string (message))); + + talloc_free (ctx_quote); + talloc_free (ctx); +} + /* Write a MIME text part out to the given stream. * * Both line-ending conversion (CRLF->LF) and charset conversion ( -> @@ -616,11 +678,14 @@ format_part_content_json (GMimeObject *part) printf (", \"content\": %s", json_quote_chararray (ctx, (char *) part_content->data, part_content->len)); } - else if (g_mime_content_type_is_type (content_type, "multipart", "*") || - g_mime_content_type_is_type (content_type, "message", "rfc822")) + else if (g_mime_content_type_is_type (content_type, "multipart", "*")) { printf (", \"content\": ["); } + else if (g_mime_content_type_is_type (content_type, "message", "rfc822")) + { + printf (", \"content\": [{"); + } talloc_free (ctx); if (stream_memory) @@ -630,13 +695,12 @@ format_part_content_json (GMimeObject *part) static void format_part_end_json (GMimeObject *part) { - GMimeContentType *content_type; - - content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); + GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part)); - if (g_mime_content_type_is_type (content_type, "multipart", "*") || - g_mime_content_type_is_type (content_type, "message", "rfc822")) + if (g_mime_content_type_is_type (content_type, "multipart", "*")) printf ("]"); + else if (g_mime_content_type_is_type (content_type, "message", "rfc822")) + printf ("}]"); printf ("}"); } diff --git a/show-message.c b/show-message.c index 7a4bbc2..d83f04e 100644 --- a/show-message.c +++ b/show-message.c @@ -149,9 +149,21 @@ show_message_part (GMimeObject *part, if (selected) state->in_zone = 1; + if (selected || (!selected && state->in_zone)) { + fputs (format->header_start, stdout); + if (format->header_message_part) + format->header_message_part (mime_message); + fputs (format->header_end, stdout); + + fputs (format->body_start, stdout); + } + show_message_part (g_mime_message_get_mime_part (mime_message), state, format, params, TRUE); + if (selected || (!selected && state->in_zone)) + fputs (format->body_end, stdout); + if (selected) state->in_zone = 0; } -- 1.7.4.4