--- /dev/null
+Return-Path: <amthrax@drake.mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 54FB8431FAE\r
+ for <notmuch@notmuchmail.org>; Thu, 22 Mar 2012 20:34:16 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 50rKvTXI2DoC for <notmuch@notmuchmail.org>;\r
+ Thu, 22 Mar 2012 20:34:14 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+ [18.7.68.37])\r
+ by olra.theworths.org (Postfix) with ESMTP id 1A415431FAF\r
+ for <notmuch@notmuchmail.org>; Thu, 22 Mar 2012 20:34:13 -0700 (PDT)\r
+X-AuditID: 12074425-b7f4a6d0000008e0-2e-4f6bef336a72\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+ by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id F6.A7.02272.33FEB6F4; Thu, 22 Mar 2012 23:34:11 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q2N3YBVC025961; \r
+ Thu, 22 Mar 2012 23:34:11 -0400\r
+Received: from drake.mit.edu\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q2N3Y8Tx007968\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Thu, 22 Mar 2012 23:34:10 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1SAvGS-0002PE-GJ; Thu, 22 Mar 2012 23:34:08 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/3] show/reply: Unify the code that extracts text parts\r
+Date: Thu, 22 Mar 2012 23:34:05 -0400\r
+Message-Id: <1332473647-9133-2-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1332473647-9133-1-git-send-email-amdragon@mit.edu>\r
+References: <1332473647-9133-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixG6nrmv8PtvfYO9HA4vrN2cyOzB6PFt1\r
+ izmAMYrLJiU1J7MstUjfLoEr4+f5rywFC3QquvsvszUwXlPpYuTkkBAwkdg9vY8dwhaTuHBv\r
+ PVsXIxeHkMA+RomGO09ZIJwNjBK3ts1lhXDuM0l0P/wLVTYfKDNzARNIP5uAhsS2/csZQWwR\r
+ AWmJnXdnA3VwcDALqEn86QJbJyzgIdH5vYcRJMwioCpxohGsk1fAXmLx1BdMEFcoSJxbfQ7s\r
+ Ik4BB4mzn++BTRQCqtn65Av7BEb+BYwMqxhlU3KrdHMTM3OKU5N1i5MT8/JSi3Qt9HIzS/RS\r
+ U0o3MYKDxkV1B+OEQ0qHGAU4GJV4eJt9sv2FWBPLiitzDzFKcjApifIyvAMK8SXlp1RmJBZn\r
+ xBeV5qQWH2KU4GBWEuFVcgbK8aYkVlalFuXDpKQ5WJTEeTW13vkJCaQnlqRmp6YWpBbBZGU4\r
+ OJQkeCeBDBUsSk1PrUjLzClBSDNxcIIM5wEanglSw1tckJhbnJkOkT/FqCglzpsCkhAASWSU\r
+ 5sH1wqL6FaM40CvCvLkgVTzAhADX/QpoMBPQ4AnXskAGlyQipKQaGD3/37Ha8L6u4qHL3h8v\r
+ DbfkBFv8CDP9mWI/1Tj217VzjhWmszUEF/FNCip52NZ4iW+q0Okts3rWhlWx7Y1w3/1oTt0v\r
+ ztKyL0HHFicrnmHc7OTle1BS/63aM46V0r2SqkVdUXzHVj05ynDNQ/2hK+tGpXsdRuZ9h+Qq\r
+ DH1mnxFJuXr/2s1jzUosxRmJhlrMRcWJAMqc3BjFAgAA\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 23 Mar 2012 03:34:16 -0000\r
+\r
+Previously, show and reply had separate implementations of decoding\r
+and printing text parts. Now both use show's implementation, which\r
+was more complete. Show's implementation has been extended with an\r
+option to add reply quoting to the extracted part (this is implemented\r
+as a named flag to avoid naked booleans, even though it's the only\r
+flag it can take).\r
+---\r
+ notmuch-client.h | 8 ++++++++\r
+ notmuch-reply.c | 28 ++++------------------------\r
+ notmuch-show.c | 23 +++++++++++++++++++----\r
+ 3 files changed, 31 insertions(+), 28 deletions(-)\r
+\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index fa04fa2..e24d6b6 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -197,6 +197,14 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first);\r
+ void\r
+ format_headers_json (const void *ctx, GMimeMessage *message, notmuch_bool_t reply);\r
+ \r
++typedef enum {\r
++ NOTMUCH_SHOW_TEXT_PART_REPLY = 1<<0,\r
++} notmuch_show_text_part_flags;\r
++\r
++void\r
++show_text_part_content (GMimeObject *part, GMimeStream *stream_out,\r
++ notmuch_show_text_part_flags flags);\r
++\r
+ char *\r
+ json_quote_chararray (const void *ctx, const char *str, const size_t len);\r
+ \r
+diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+index e2b6c25..2f5ed3d 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -21,7 +21,6 @@\r
+ */\r
+ \r
+ #include "notmuch-client.h"\r
+-#include "gmime-filter-reply.h"\r
+ #include "gmime-filter-headers.h"\r
+ \r
+ static void\r
+@@ -106,29 +105,10 @@ reply_part_content (GMimeObject *part)\r
+ else if (g_mime_content_type_is_type (content_type, "text", "*") &&\r
+ !g_mime_content_type_is_type (content_type, "text", "html"))\r
+ {\r
+- GMimeStream *stream_stdout = NULL, *stream_filter = NULL;\r
+- GMimeDataWrapper *wrapper;\r
+- const char *charset;\r
+-\r
+- charset = g_mime_object_get_content_type_parameter (part, "charset");\r
+- stream_stdout = g_mime_stream_file_new (stdout);\r
+- if (stream_stdout) {\r
+- g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);\r
+- stream_filter = g_mime_stream_filter_new(stream_stdout);\r
+- if (charset) {\r
+- g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),\r
+- g_mime_filter_charset_new(charset, "UTF-8"));\r
+- }\r
+- }\r
+- g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),\r
+- g_mime_filter_reply_new(TRUE));\r
+- wrapper = g_mime_part_get_content_object (GMIME_PART (part));\r
+- if (wrapper && stream_filter)\r
+- g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);\r
+- if (stream_filter)\r
+- g_object_unref(stream_filter);\r
+- if (stream_stdout)\r
+- g_object_unref(stream_stdout);\r
++ GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);\r
++ g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);\r
++ show_text_part_content (part, stream_stdout, NOTMUCH_SHOW_TEXT_PART_REPLY);\r
++ g_object_unref(stream_stdout);\r
+ }\r
+ else\r
+ {\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index ff9d427..9944791 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -19,6 +19,7 @@\r
+ */\r
+ \r
+ #include "notmuch-client.h"\r
++#include "gmime-filter-reply.h"\r
+ \r
+ static notmuch_status_t\r
+ format_part_text (const void *ctx, mime_node_t *node,\r
+@@ -247,13 +248,17 @@ format_headers_json (const void *ctx, GMimeMessage *message, notmuch_bool_t repl\r
+ \r
+ /* Write a MIME text part out to the given stream.\r
+ *\r
++ * If flags&NOTMUCH_SHOW_TEXT_PART_REPLY, this prepends "> " to each\r
++ * output line.\r
++ *\r
+ * Both line-ending conversion (CRLF->LF) and charset conversion ( ->\r
+ * UTF-8) will be performed, so it is inappropriate to call this\r
+ * function with a non-text part. Doing so will trigger an internal\r
+ * error.\r
+ */\r
+-static void\r
+-show_text_part_content (GMimeObject *part, GMimeStream *stream_out)\r
++void\r
++show_text_part_content (GMimeObject *part, GMimeStream *stream_out,\r
++ notmuch_show_text_part_flags flags)\r
+ {\r
+ GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));\r
+ GMimeStream *stream_filter = NULL;\r
+@@ -286,6 +291,16 @@ show_text_part_content (GMimeObject *part, GMimeStream *stream_out)\r
+ \r
+ }\r
+ \r
++ if (flags & NOTMUCH_SHOW_TEXT_PART_REPLY) {\r
++ GMimeFilter *reply_filter;\r
++ reply_filter = g_mime_filter_reply_new (TRUE);\r
++ if (reply_filter) {\r
++ g_mime_stream_filter_add (GMIME_STREAM_FILTER (stream_filter),\r
++ reply_filter);\r
++ g_object_unref (reply_filter);\r
++ }\r
++ }\r
++\r
+ wrapper = g_mime_part_get_content_object (GMIME_PART (part));\r
+ if (wrapper && stream_filter)\r
+ g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);\r
+@@ -532,7 +547,7 @@ format_part_text (const void *ctx, mime_node_t *node,\r
+ {\r
+ GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);\r
+ g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);\r
+- show_text_part_content (node->part, stream_stdout);\r
++ show_text_part_content (node->part, stream_stdout, 0);\r
+ g_object_unref(stream_stdout);\r
+ } else {\r
+ printf ("Non-text part: %s\n",\r
+@@ -624,7 +639,7 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\r
+ } else if (g_mime_content_type_is_type (content_type, "text", "*")) {\r
+ GMimeStream *stream_memory = g_mime_stream_mem_new ();\r
+ GByteArray *part_content;\r
+- show_text_part_content (node->part, stream_memory);\r
++ show_text_part_content (node->part, stream_memory, 0);\r
+ part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (stream_memory));\r
+ \r
+ printf (", \"content\": %s", json_quote_chararray (local, (char *) part_content->data, part_content->len));\r
+-- \r
+1.7.7.3\r
+\r
projects / notmuch-archives.git / commitdiff