[PATCH 1/4] show: indicate length of omitted body content (json)

diff --git a/5c/7222e7e5e5d3894e9e2407aca18030c3568486 b/5c/7222e7e5e5d3894e9e2407aca18030c3568486
new file mode 100644 (file)
index 0000000..c2e87c3
--- /dev/null
+++ b/5c/7222e7e5e5d3894e9e2407aca18030c3568486
@@ -0,0 +1,106 @@
+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 04C01431FAF\r
+       for <notmuch@notmuchmail.org>; Sun,  5 Aug 2012 00:22:42 -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 EwfJmW2X-tWq for <notmuch@notmuchmail.org>;\r
+       Sun,  5 Aug 2012 00:22:41 -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 804DC431FAE\r
+       for <notmuch@notmuchmail.org>; Sun,  5 Aug 2012 00:22:41 -0700 (PDT)\r
+Received: by pbbro8 with SMTP id ro8so3935886pbb.26\r
+       for <notmuch@notmuchmail.org>; Sun, 05 Aug 2012 00:22:40 -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;\r
+       bh=PJUe6fnrljYh20/N+hiZ/B+9DabpRSOCgbWic7ASyCs=;\r
+       b=lb4dtVfgmmPABIyTQhoi8XqgivAhopEMuuTdDGT+qFWZNIPF+e4luWReVi0IFfiP3c\r
+       PVpNjVSoq0Y8XlqstNnuIZ2RSv90cL8dmgdOaSdYo+TzW+iXlGg4WmVQotZhHHd0O6L0\r
+       TW8tPlc0J8athoTix2n23pbANaCEyKyLcnHSFj09NnAgnIn4Zo7RVQw/QNbBSUOJf1Vu\r
+       ZYSeBm+ooPMjALezXUhzce/FENFljGk9H2xuMaO9omDvbshXhOW1hujmR3N8z0Pke1N2\r
+       COoi/0q5MLjfzC7pnnxvoZ/z3QPr3viwhiMhHRcIJbUNk8TW/95dDNEJ28Ne7K8TEWk2\r
+       SOFQ==\r
+Received: by 10.68.239.164 with SMTP id vt4mr706718pbc.118.1344151360697;\r
+       Sun, 05 Aug 2012 00:22:40 -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 of4sm6404538pbb.51.2012.08.05.00.22.37\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sun, 05 Aug 2012 00:22:39 -0700 (PDT)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/4] show: indicate length of omitted body content (json)\r
+Date: Sun,  5 Aug 2012 17:22:22 +1000\r
+Message-Id: <1344151345-25411-1-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.4.4\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:42 -0000\r
+\r
+If a leaf part's body content is omitted, return the content length in\r
+--format=json output.  This information may be used by the consumer,\r
+e.g. to decide whether to download a large attachment over a slow link.\r
+---\r
+ devel/schemata |    5 ++++-\r
+ notmuch-show.c |    8 ++++++++\r
+ 2 files changed, 12 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/devel/schemata b/devel/schemata\r
+index 9cb25f5..3df2764 100644\r
+--- a/devel/schemata\r
++++ b/devel/schemata\r
+@@ -69,7 +69,10 @@ part = {\r
+     # A leaf part's body content is optional, but may be included if\r
+     # it can be correctly encoded as a string.  Consumers should use\r
+     # this in preference to fetching the part content separately.\r
+-    content?:       string\r
++    content?:       string,\r
++    # If a leaf part's body content is not included, the content-length\r
++    # may be included instead.\r
++    content-length?: int\r
+ }\r
+ \r
+ # The headers of a message or part (format_headers_json with reply = FALSE)\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 3556293..5c54257 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -664,6 +664,14 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+           sp->map_key (sp, "content");\r
+           sp->string_len (sp, (char *) part_content->data, part_content->len);\r
+           g_object_unref (stream_memory);\r
++      } else {\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
++              sp->map_key (sp, "content-length");\r
++              sp->integer (sp, length);\r
++          }\r
+       }\r
+     } else if (GMIME_IS_MULTIPART (node->part)) {\r
+       sp->map_key (sp, "content");\r
+-- \r
+1.7.4.4\r
+\r