From 922c26bcabd10ee77dd147f90d2b551a97718eeb Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 28 Mar 2012 17:59:51 +2000 Subject: [PATCH] [PATCH v2 2/3] reply: Convert default reply format to self-recursive style --- 5e/76cbb883c61774903ff75dbcaab7d5a0151ce2 | 245 ++++++++++++++++++++++ 1 file changed, 245 insertions(+) create mode 100644 5e/76cbb883c61774903ff75dbcaab7d5a0151ce2 diff --git a/5e/76cbb883c61774903ff75dbcaab7d5a0151ce2 b/5e/76cbb883c61774903ff75dbcaab7d5a0151ce2 new file mode 100644 index 000000000..48e7e1658 --- /dev/null +++ b/5e/76cbb883c61774903ff75dbcaab7d5a0151ce2 @@ -0,0 +1,245 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id CA737431FC9 + for ; Tue, 27 Mar 2012 14:59:59 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 hZ4ZwYNkFyVr for ; + Tue, 27 Mar 2012 14:59:58 -0700 (PDT) +Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU + [18.9.25.15]) + by olra.theworths.org (Postfix) with ESMTP id AB160431FC7 + for ; Tue, 27 Mar 2012 14:59:57 -0700 (PDT) +X-AuditID: 1209190f-b7f8a6d000000914-33-4f72385c6e03 +Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) + by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP + id 75.1A.02324.C58327F4; Tue, 27 Mar 2012 17:59:56 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q2RLxtbr013555; + Tue, 27 Mar 2012 17:59:55 -0400 +Received: from drake.mit.edu (26-4-166.dynamic.csail.mit.edu [18.26.4.166]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q2RLxsYX014143 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Tue, 27 Mar 2012 17:59:55 -0400 (EDT) +Received: from amthrax by drake.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1SCeQk-0008Vs-Mk; Tue, 27 Mar 2012 17:59:54 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2 2/3] reply: Convert default reply format to self-recursive + style +Date: Tue, 27 Mar 2012 17:59:51 -0400 +Message-Id: <1332885592-32668-3-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1332885592-32668-1-git-send-email-amdragon@mit.edu> +References: <1332473647-9133-1-git-send-email-amdragon@mit.edu> + <1332885592-32668-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixG6nohtjUeRvMOupusX1mzOZHRg9nq26 + xRzAGMVlk5Kak1mWWqRvl8CV8fnnc7aC3UYVB/uOszYwbtHsYuTkkBAwkZjz9gszhC0mceHe + erYuRi4OIYF9jBKrV7xnhXA2MEr8ednADuEcZ5KY0nSSGcKZzyjRMmUqK0g/m4CGxLb9yxlB + bBEBaYmdd2cDxTk4mAXUJP50qYCEhQWCJabdXcsOYrMIqErMmTmREaSEV8BBYt5hcYgrFCSe + rTvOBGJzCjhKXN31BswWEiiTuHPpNOsERv4FjAyrGGVTcqt0cxMzc4pTk3WLkxPz8lKLdE30 + cjNL9FJTSjcxgoKGU5J/B+O3g0qHGAU4GJV4eJUZivyFWBPLiitzDzFKcjApifIqmAKF+JLy + UyozEosz4otKc1KLDzFKcDArifBqRxX6C/GmJFZWpRblw6SkOViUxHnVtN75CQmkJ5akZqem + FqQWwWRlODiUJHjbzIGGChalpqdWpGXmlCCkmTg4QYbzAA3/bAZUw1tckJhbnJkOkT/FqCgl + zhsF0iwAksgozYPrhUX1K0ZxoFeEefNAqniACQGu+xXQYCagwUuO5IMMLklESEk1MM6vf7OW + aW1YCUeQ0XuHuWeXLF1gqHh4d8/OF8vPJL55mtkg7rF5C9ekLNHVkbPrdqoUC7Worsk5Uxud + bS4tLujeVlRcX8GSX7gi/HLJmcbaLQfrP6u85TtvK/1oR6I219UWJcWgI3e2Jn1wdWEuMpGr + WOLheWu//QUV8W4Fn1ein+NjBJfXKbEUZyQaajEXFScCAP3rGYHFAgAA +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: Tue, 27 Mar 2012 22:00:00 -0000 + +This re-arranges the default reply formatter code to use the +mime_node_t abstraction. There are no semantic changes. +--- + notmuch-reply.c | 123 +++++++++++++++++++++---------------------------------- + 1 files changed, 47 insertions(+), 76 deletions(-) + +diff --git a/notmuch-reply.c b/notmuch-reply.c +index 2f5ed3d..84a1220 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -24,28 +24,6 @@ + #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, +- NULL, +- reply_part_content, +- NULL, +- "", +- "", +- "", "", +- "" +-}; +- +-static void + show_reply_headers (GMimeMessage *message) + { + GMimeStream *stream_stdout = NULL, *stream_filter = NULL; +@@ -65,66 +43,55 @@ show_reply_headers (GMimeMessage *message) + } + + static void +-reply_headers_message_part (GMimeMessage *message) ++format_part_reply (mime_node_t *node) + { +- 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)); +- GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part); ++ int i; + +- if (g_mime_content_type_is_type (content_type, "multipart", "*") || +- g_mime_content_type_is_type (content_type, "message", "rfc822")) +- { +- /* Output nothing, since multipart subparts will be handled individually. */ +- } +- else if (g_mime_content_type_is_type (content_type, "application", "pgp-encrypted") || +- g_mime_content_type_is_type (content_type, "application", "pgp-signature")) +- { +- /* Ignore PGP/MIME cruft parts */ +- } +- else if (g_mime_content_type_is_type (content_type, "text", "*") && +- !g_mime_content_type_is_type (content_type, "text", "html")) +- { +- GMimeStream *stream_stdout = g_mime_stream_file_new (stdout); +- g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE); +- show_text_part_content (part, stream_stdout, NOTMUCH_SHOW_TEXT_PART_REPLY); +- g_object_unref(stream_stdout); +- } +- else +- { +- if (disposition && +- strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) +- { +- const char *filename = g_mime_part_get_filename (GMIME_PART (part)); ++ if (GMIME_IS_MESSAGE (node->part)) { ++ GMimeMessage *message = GMIME_MESSAGE (node->part); ++ 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)); ++ printf (">\n"); ++ } else if (GMIME_IS_PART (node->part)) { ++ GMimeContentType *content_type = g_mime_object_get_content_type (node->part); ++ GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (node->part); ++ ++ if (g_mime_content_type_is_type (content_type, "application", "pgp-encrypted") || ++ g_mime_content_type_is_type (content_type, "application", "pgp-signature")) { ++ /* Ignore PGP/MIME cruft parts */ ++ } else if (g_mime_content_type_is_type (content_type, "text", "*") && ++ !g_mime_content_type_is_type (content_type, "text", "html")) { ++ GMimeStream *stream_stdout = g_mime_stream_file_new (stdout); ++ g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE); ++ show_text_part_content (node->part, stream_stdout, NOTMUCH_SHOW_TEXT_PART_REPLY); ++ g_object_unref(stream_stdout); ++ } else if (disposition && ++ strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0) { ++ const char *filename = g_mime_part_get_filename (GMIME_PART (node->part)); + printf ("Attachment: %s (%s)\n", filename, + g_mime_content_type_to_string (content_type)); +- } +- else +- { ++ } else { + printf ("Non-text part: %s\n", + g_mime_content_type_to_string (content_type)); + } + } ++ ++ for (i = 0; i < node->nchildren; i++) ++ format_part_reply (mime_node_child (node, i)); + } + + /* Is the given address configured as one of the user's "personal" or +@@ -550,7 +517,7 @@ notmuch_reply_format_default(void *ctx, + GMimeMessage *reply; + notmuch_messages_t *messages; + notmuch_message_t *message; +- const notmuch_show_format_t *format = &format_reply; ++ mime_node_t *root; + + for (messages = notmuch_query_search_messages (query); + notmuch_messages_valid (messages); +@@ -577,7 +544,11 @@ notmuch_reply_format_default(void *ctx, + notmuch_message_get_header (message, "date"), + notmuch_message_get_header (message, "from")); + +- show_message_body (message, format, params); ++ if (mime_node_open (ctx, message, params->cryptoctx, params->decrypt, ++ &root) == NOTMUCH_STATUS_SUCCESS) { ++ format_part_reply (mime_node_child (root, 0)); ++ talloc_free (root); ++ } + + notmuch_message_destroy (message); + } +-- +1.7.9.1 + -- 2.26.2