--- /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 68870429E25\r
+ for <notmuch@notmuchmail.org>; Wed, 11 Jan 2012 17:49:48 -0800 (PST)\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 If54rhDurTQW for <notmuch@notmuchmail.org>;\r
+ Wed, 11 Jan 2012 17:49:47 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+ [18.7.68.36])\r
+ by olra.theworths.org (Postfix) with ESMTP id B49A9431FB6\r
+ for <notmuch@notmuchmail.org>; Wed, 11 Jan 2012 17:49:46 -0800 (PST)\r
+X-AuditID: 12074424-b7fae6d000000906-f1-4f0e3c398ff9\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+ by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 80.E3.02310.93C3E0F4; Wed, 11 Jan 2012 20:49:45 -0500 (EST)\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 q0C1nj6m029648; \r
+ Wed, 11 Jan 2012 20:49:45 -0500\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 q0C1ngH3001516\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Wed, 11 Jan 2012 20:49:44 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1Rl9nS-00080F-My; Wed, 11 Jan 2012 20:49:42 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [RFC PATCH 5/5] show: Simplify new text formatter code\r
+Date: Wed, 11 Jan 2012 20:49:33 -0500\r
+Message-Id: <1326332973-30225-6-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1326332973-30225-1-git-send-email-amdragon@mit.edu>\r
+References: <1326332973-30225-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixG6nrmtpw+dv8GuVpMX1mzOZHRg9nq26\r
+ xRzAGMVlk5Kak1mWWqRvl8CV8X9xI3vBGY+KpVuSGxiXW3cxcnJICJhI/HiyhRXCFpO4cG89\r
+ WxcjF4eQwD5GiamrbjFBOBsYJVa9m8wO4dxnkmj/s5oZwpnPKDH77iFGkH42AQ2JbfuXg9ki\r
+ AtISO+/OBprLwcEsICLxbiYTSFhYwF7i2KNzYGEWAVWJvle1IGFeAQeJEz3XWCCuUJA4t/oc\r
+ O4jNKeAo0X/8GBuILQRU82LnU+YJjPwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Zrr5WaW\r
+ 6KWmlG5iBIeMi8oOxuZDSocYBTgYlXh4d+zl9RdiTSwrrsw9xCjJwaQkyvvdis9fiC8pP6Uy\r
+ I7E4I76oNCe1+BCjBAezkgivUw1QOW9KYmVValE+TEqag0VJnFdD652fkEB6YklqdmpqQWoR\r
+ TFaGg0NJgrfEGmioYFFqempFWmZOCUKaiYMTZDgP0PAMkBre4oLE3OLMdIj8KUZFKXFed5CE\r
+ AEgiozQPrhcW068YxYFeEebNB6niAaYDuO5XQIOZgAZvWccDMrgkESEl1cBYdup0keXWmXMT\r
+ Oxrm+1R4lktd+Jaw9FZg8IpKQ/uNT/z+zezw/l+dXq8WezNh2TEHqaP8TJMZZ6cY9l1uEDe+\r
+ nbPl4GHhk2qSO14uOfeO7+CDhTu0OL41nD5+5k9JUf7KmP8nebfsVHFkTYqpmMk4jcXi0MKP\r
+ 2Wemv73185f1tHM6+k9UGtYzKbEUZyQaajEXFScCAI+/5ZrEAgAA\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: Thu, 12 Jan 2012 01:49:48 -0000\r
+\r
+This makes the text formatter take advantage of the new code\r
+structure. The previously duplicated header logic is now unified,\r
+several things that we used to compute repeatedly across different\r
+callbacks are now computed once, and the code is generally simplified.\r
+\r
+Unifying the header logic causes this to format some dates slightly\r
+differently, so the two affected test cases are updated.\r
+---\r
+ notmuch-show.c | 84 ++++++++++++----------------------------------------\r
+ test/crypto | 2 +-\r
+ test/thread-naming | 16 +++++-----\r
+ 3 files changed, 28 insertions(+), 74 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 3241965..1689222 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -175,67 +175,42 @@ format_part_text (const void *ctx, mime_node_t *node,\r
+ GMimeObject *meta = node->envelope_part ?\r
+ GMIME_OBJECT (node->envelope_part) : node->part;\r
+ GMimeContentType *content_type = g_mime_object_get_content_type (meta);\r
++ GMimeContentDisposition *disposition =\r
++ g_mime_object_get_content_disposition (meta);\r
++ notmuch_bool_t attachment = disposition &&\r
++ strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0;\r
++ notmuch_bool_t leaf = GMIME_IS_PART (node->part);\r
+ int i;\r
+ \r
+ if (node->envelope_file) {\r
+ notmuch_message_t *message = node->envelope_file;\r
+- const char *headers[] = {\r
+- "Subject", "From", "To", "Cc", "Bcc", "Date"\r
+- };\r
+- const char *name, *value;\r
+- unsigned int i;\r
+ \r
+- printf ("\fmessage{ ");\r
+- printf ("id:%s depth:%d match:%d filename:%s\n",\r
++ printf ("\fmessage{ id:%s depth:%d match:%d filename:%s\n",\r
+ notmuch_message_get_message_id (message),\r
+ indent,\r
+ notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH),\r
+ notmuch_message_get_filename (message));\r
+-\r
+- printf ("\fheader{\n");\r
+-\r
+- printf ("%s\n", _get_one_line_summary (ctx, message));\r
+-\r
+- for (i = 0; i < ARRAY_SIZE (headers); i++) {\r
+- name = headers[i];\r
+- value = notmuch_message_get_header (message, name);\r
+- if (value && strlen (value))\r
+- printf ("%s: %s\n", name, value);\r
+- }\r
+- printf ("\fheader}\n");\r
+ } else {\r
+- GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (meta);\r
+ const char *cid = g_mime_object_get_content_id (meta);\r
++ const char *filename = leaf ?\r
++ g_mime_part_get_filename (GMIME_PART (node->part)) : NULL;\r
+ \r
+- if (disposition &&\r
+- strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)\r
+- {\r
+- printf ("\fattachment{ ID: %d", node->part_num);\r
+-\r
+- } else {\r
+-\r
+- printf ("\fpart{ ID: %d", node->part_num);\r
+- }\r
+-\r
+- if (GMIME_IS_PART (node->part))\r
+- {\r
+- const char *filename = g_mime_part_get_filename (GMIME_PART (node->part));\r
+- if (filename)\r
+- printf (", Filename: %s", filename);\r
+- }\r
+-\r
++ printf ("\f%s{ ID: %d", attachment ? "attachment" : "part", node->part_num);\r
++ if (filename)\r
++ printf (", Filename: %s", filename);\r
+ if (cid)\r
+ printf (", Content-id: %s", cid);\r
+-\r
+ printf (", Content-type: %s\n", g_mime_content_type_to_string (content_type));\r
+ }\r
+ \r
+- if (node->envelope_part) {\r
++ if (GMIME_IS_MESSAGE (node->part)) {\r
+ GMimeMessage *message = GMIME_MESSAGE (node->part);\r
+ InternetAddressList *recipients;\r
+ const char *recipients_string;\r
+ \r
+ printf ("\fheader{\n");\r
++ if (node->envelope_file)\r
++ printf ("%s\n", _get_one_line_summary (ctx, node->envelope_file));\r
+ printf ("Subject: %s\n", g_mime_message_get_subject (message));\r
+ printf ("From: %s\n", g_mime_message_get_sender (message));\r
+ recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);\r
+@@ -248,9 +223,11 @@ format_part_text (const void *ctx, mime_node_t *node,\r
+ printf ("Cc: %s\n", recipients_string);\r
+ printf ("Date: %s\n", g_mime_message_get_date_as_string (message));\r
+ printf ("\fheader}\n");\r
++\r
++ printf ("\fbody{\n");\r
+ }\r
+ \r
+- if (!node->envelope_file) {\r
++ if (leaf) {\r
+ if (g_mime_content_type_is_type (content_type, "text", "*") &&\r
+ !g_mime_content_type_is_type (content_type, "text", "html"))\r
+ {\r
+@@ -258,24 +235,12 @@ format_part_text (const void *ctx, mime_node_t *node,\r
+ g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);\r
+ show_text_part_content (node->part, stream_stdout);\r
+ g_object_unref(stream_stdout);\r
+- }\r
+- else if (g_mime_content_type_is_type (content_type, "multipart", "*") ||\r
+- g_mime_content_type_is_type (content_type, "message", "rfc822"))\r
+- {\r
+- /* Do nothing for multipart since its content will be printed\r
+- * when recursing. */\r
+- }\r
+- else\r
+- {\r
++ } else {\r
+ printf ("Non-text part: %s\n",\r
+ g_mime_content_type_to_string (content_type));\r
+ }\r
+ }\r
+ \r
+- if (GMIME_IS_MESSAGE (node->part)) {\r
+- printf ("\fbody{\n");\r
+- }\r
+-\r
+ for (i = 0; i < node->nchildren; i++)\r
+ format_part_text (ctx, mime_node_child (node, i), indent, params);\r
+ \r
+@@ -286,18 +251,7 @@ format_part_text (const void *ctx, mime_node_t *node,\r
+ if (node->envelope_file) {\r
+ printf ("\fmessage}\n");\r
+ } else {\r
+- GMimeContentDisposition *disposition;\r
+-\r
+- disposition = g_mime_object_get_content_disposition (meta);\r
+- if (disposition &&\r
+- strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)\r
+- {\r
+- printf ("\fattachment}\n");\r
+- }\r
+- else\r
+- {\r
+- printf ("\fpart}\n");\r
+- }\r
++ printf ("\f%s}\n", attachment ? "attachment" : "part");\r
+ }\r
+ }\r
+ \r
+diff --git a/test/crypto b/test/crypto\r
+index 0af4aa8..6723ef8 100755\r
+--- a/test/crypto\r
++++ b/test/crypto\r
+@@ -157,7 +157,7 @@ Notmuch Test Suite <test_suite@notmuchmail.org> (2000-01-01) (encrypted inbox)\r
+ Subject: test encrypted message 001\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ To: test_suite@notmuchmail.org\r
+-Date: 01 Jan 2000 12:00:00 -0000\r
++Date: Sat, 01 Jan 2000 12:00:00 +0000\r
+ \f\r
+header}\r
+ \f\r
+body{\r
+ \f\r
+part{ ID: 1, Content-type: multipart/encrypted\r
+diff --git a/test/thread-naming b/test/thread-naming\r
+index 41b97d9..b7c96f2 100755\r
+--- a/test/thread-naming\r
++++ b/test/thread-naming\r
+@@ -71,7 +71,7 @@ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-05) (unread)\r
+ Subject: thread-naming: Initial thread subject\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ To: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+-Date: Fri, 05 Jan 2001 15:43:56 -0000\r
++Date: Fri, 05 Jan 2001 15:43:56 +0000\r
+ \f\r
+header}\r
+ \f\r
+body{\r
+ \f\r
+part{ ID: 1, Content-type: text/plain\r
+@@ -85,7 +85,7 @@ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-06) (inbox unread)\r
+ Subject: thread-naming: Older changed subject\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ To: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+-Date: Sat, 06 Jan 2001 15:43:56 -0000\r
++Date: Sat, 06 Jan 2001 15:43:56 +0000\r
+ \f\r
+header}\r
+ \f\r
+body{\r
+ \f\r
+part{ ID: 1, Content-type: text/plain\r
+@@ -99,7 +99,7 @@ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-07) (inbox unread)\r
+ Subject: thread-naming: Newer changed subject\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ To: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+-Date: Sun, 07 Jan 2001 15:43:56 -0000\r
++Date: Sun, 07 Jan 2001 15:43:56 +0000\r
+ \f\r
+header}\r
+ \f\r
+body{\r
+ \f\r
+part{ ID: 1, Content-type: text/plain\r
+@@ -113,7 +113,7 @@ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-08) (unread)\r
+ Subject: thread-naming: Final thread subject\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ To: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+-Date: Mon, 08 Jan 2001 15:43:56 -0000\r
++Date: Mon, 08 Jan 2001 15:43:56 +0000\r
+ \f\r
+header}\r
+ \f\r
+body{\r
+ \f\r
+part{ ID: 1, Content-type: text/plain\r
+@@ -127,7 +127,7 @@ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-09) (inbox unread)\r
+ Subject: Re: thread-naming: Initial thread subject\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ To: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+-Date: Tue, 09 Jan 2001 15:43:45 -0000\r
++Date: Tue, 09 Jan 2001 15:43:45 +0000\r
+ \f\r
+header}\r
+ \f\r
+body{\r
+ \f\r
+part{ ID: 1, Content-type: text/plain\r
+@@ -141,7 +141,7 @@ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-10) (inbox unread)\r
+ Subject: Aw: thread-naming: Initial thread subject\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ To: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+-Date: Wed, 10 Jan 2001 15:43:45 -0000\r
++Date: Wed, 10 Jan 2001 15:43:45 +0000\r
+ \f\r
+header}\r
+ \f\r
+body{\r
+ \f\r
+part{ ID: 1, Content-type: text/plain\r
+@@ -155,7 +155,7 @@ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-11) (inbox unread)\r
+ Subject: Vs: thread-naming: Initial thread subject\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ To: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+-Date: Thu, 11 Jan 2001 15:43:45 -0000\r
++Date: Thu, 11 Jan 2001 15:43:45 +0000\r
+ \f\r
+header}\r
+ \f\r
+body{\r
+ \f\r
+part{ ID: 1, Content-type: text/plain\r
+@@ -169,7 +169,7 @@ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-12) (inbox unread)\r
+ Subject: Sv: thread-naming: Initial thread subject\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ To: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+-Date: Fri, 12 Jan 2001 15:43:45 -0000\r
++Date: Fri, 12 Jan 2001 15:43:45 +0000\r
+ \f\r
+header}\r
+ \f\r
+body{\r
+ \f\r
+part{ ID: 1, Content-type: text/plain\r
+-- \r
+1.7.7.3\r
+\r
projects / notmuch-archives.git / commitdiff