[PATCH 3/4] show: indicate length of omitted body content (text)

diff --git a/9d/24ac912c65b2b58f6cfb86c5113c1258d45b1a b/9d/24ac912c65b2b58f6cfb86c5113c1258d45b1a
new file mode 100644 (file)
index 0000000..6991120
--- /dev/null
+++ b/9d/24ac912c65b2b58f6cfb86c5113c1258d45b1a
@@ -0,0 +1,122 @@
+Return-Path: <novalazy@gmail.com>\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 D7F8A431FC0\r
+       for <notmuch@notmuchmail.org>; Sun,  5 Aug 2012 00:22:57 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, 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 YPoJ4FswajM3 for <notmuch@notmuchmail.org>;\r
+       Sun,  5 Aug 2012 00:22:56 -0700 (PDT)\r
+Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com\r
+       [209.85.160.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id EC46A431FC9\r
+       for <notmuch@notmuchmail.org>; Sun,  5 Aug 2012 00:22:52 -0700 (PDT)\r
+Received: by mail-pb0-f53.google.com with SMTP id ro8so3935886pbb.26\r
+       for <notmuch@notmuchmail.org>; Sun, 05 Aug 2012 00:22:52 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=2r9napsdlhmpo6bzVYOfb4NhdMAwQsnGQhu3cVy1zHs=;\r
+       b=AE+EsX9PYbv8ocarLfThTQoWmg3Lrn0MvBg+B6fiTgqdh/A7q9Kfnc+VgcuDd5Yb8c\r
+       ng12jrNItoVA4oJGURFkgvouArBG/7Tw5la09ycNVT+7cBubQGBwLmkRwa7Lqy9W2ZhS\r
+       qYPrtZMgUSzjW4t5zegBh3pLAL0mxCH6az//P7DuhmAJt7cTHoDKLH0n7JquFgPFnbyX\r
+       JKfgQ81tN5iIMFKV30u+ksxAcL1foRIRKuTFQSJ3pvH3fYzTMGZinhKeyTTPUFXZyAIq\r
+       WKbGhYHEZWM6N9el0vB7hOt7buBEOJlR0YM5G0YoAj7lgROubj/3/WolPGlGXmtMSXRN\r
+       ijDQ==\r
+Received: by 10.66.75.74 with SMTP id a10mr9866871paw.46.1344151372775;\r
+       Sun, 05 Aug 2012 00:22:52 -0700 (PDT)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+       [220.233.42.215])\r
+       by mx.google.com with ESMTPS id sh3sm6413930pbc.16.2012.08.05.00.22.50\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sun, 05 Aug 2012 00:22:52 -0700 (PDT)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/4] show: indicate length of omitted body content (text)\r
+Date: Sun,  5 Aug 2012 17:22:24 +1000\r
+Message-Id: <1344151345-25411-3-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.4.4\r
+In-Reply-To: <1344151345-25411-1-git-send-email-novalazy@gmail.com>\r
+References: <1344151345-25411-1-git-send-email-novalazy@gmail.com>\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: Sun, 05 Aug 2012 07:22:58 -0000\r
+\r
+If a leaf part's body content is omitted, return the content length in\r
+--format=text output, for parity with --format=json output.\r
+---\r
+ notmuch-show.c |   23 +++++++++++++++++++----\r
+ 1 files changed, 19 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 5c54257..cde8a1e 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -488,9 +488,17 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+       GMIME_OBJECT (node->envelope_part) : node->part;\r
+     GMimeContentType *content_type = g_mime_object_get_content_type (meta);\r
+     const notmuch_bool_t leaf = GMIME_IS_PART (node->part);\r
++    notmuch_bool_t leaf_text_part = FALSE;\r
+     const char *part_type;\r
+     int i;\r
+ \r
++    if (leaf &&\r
++      g_mime_content_type_is_type (content_type, "text", "*") &&\r
++      !g_mime_content_type_is_type (content_type, "text", "html"))\r
++    {\r
++      leaf_text_part = TRUE;\r
++    }\r
++\r
+     if (node->envelope_file) {\r
+       notmuch_message_t *message = node->envelope_file;\r
+ \r
+@@ -519,7 +527,16 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+           printf (", Filename: %s", filename);\r
+       if (cid)\r
+           printf (", Content-id: %s", cid);\r
+-      printf (", Content-type: %s\n", g_mime_content_type_to_string (content_type));\r
++      printf (", Content-type: %s", g_mime_content_type_to_string (content_type));\r
++      if (leaf && !leaf_text_part) {\r
++          GMimeDataWrapper *wrapper = g_mime_part_get_content_object (GMIME_PART (node->part));\r
++          GMimeStream *stream = g_mime_data_wrapper_get_stream (wrapper);\r
++          ssize_t length = g_mime_stream_length (stream);\r
++          if (length >= 0) {\r
++              printf (", Content-length: %ld", length);\r
++          }\r
++      }\r
++      printf ("\n");\r
+     }\r
+ \r
+     if (GMIME_IS_MESSAGE (node->part)) {\r
+@@ -547,9 +564,7 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+     }\r
+ \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
++      if (leaf_text_part) {\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, 0);\r
+-- \r
+1.7.4.4\r
+\r