[PATCH v2 1/4] cli: add --body=true|false option to notmuch-show.c

diff --git a/54/36ca88bdd296cbb31bea022b32b646ccaeb64b b/54/36ca88bdd296cbb31bea022b32b646ccaeb64b
new file mode 100644 (file)
index 0000000..dde0515
--- /dev/null
+++ b/54/36ca88bdd296cbb31bea022b32b646ccaeb64b
@@ -0,0 +1,195 @@
+Return-Path: <markwalters1009@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 F2FDA431FD6\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Jul 2012 10:57:47 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       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 ENPp7lbfCoxb for <notmuch@notmuchmail.org>;\r
+       Mon, 23 Jul 2012 10:57:46 -0700 (PDT)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 006DC431FBC\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Jul 2012 10:57:45 -0700 (PDT)\r
+Received: by weyt57 with SMTP id t57so4988618wey.26\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Jul 2012 10:57:44 -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=sUC2MJN5l21g6QXsVIox02OmEDjessR4wrfOjX1eHQM=;\r
+       b=Z4CwTGkGbip+s19VUyzpIPX2aROGGRjJPbgh6q5s1BkRBD/17ikCaDPonpRau08tXH\r
+       XkZzHQYwL2PpOUgNVRnMOWC0dQ+Y2zbgwoxBd00Yf/uO/QrbG662WoCOEl3qdG+EeCdj\r
+       RSz7SJ5uHSQhrrNh5U4xFWvKy7HzDjkoi2p1oItZeXGtj+B/b8bL4e1c6y1YuoyX9Si5\r
+       Ko5gnpybdrFvHJ2NOiDB94YBba5vM8RkGQFY3T/feHrPtmiHstutsQZYmb3HelCFGtVb\r
+       pCY3MvzqEHxqJaYOqPpanNR2m5AVzbpec5PGxqVOnsT5N7oEOv+zlEf26WtvwjixWW7x\r
+       T27w==\r
+Received: by 10.216.136.158 with SMTP id w30mr8465810wei.136.1343066264670;\r
+       Mon, 23 Jul 2012 10:57:44 -0700 (PDT)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223])     by mx.google.com with ESMTPS id\r
+ y5sm18013155wiw.9.2012.07.23.10.57.42 (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Mon, 23 Jul 2012 10:57:43 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 1/4] cli: add --body=true|false option to notmuch-show.c\r
+Date: Mon, 23 Jul 2012 18:57:36 +0100\r
+Message-Id: <1343066259-22523-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1343066259-22523-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1343066259-22523-1-git-send-email-markwalters1009@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: Mon, 23 Jul 2012 17:57:48 -0000\r
+\r
+This option allows the caller to suppress the output of the bodies of\r
+the messages. Currently this is only implemented for format=json.\r
+\r
+This is used by notmuch-pick.el (although not needed) because it gives\r
+a speed-up of at least a factor of a two (and in some cases a speed up\r
+of more than a factor of 8); moreover it reduces the memory usage in\r
+emacs hugely.\r
+---\r
+ notmuch-client.h |    3 ++-\r
+ notmuch-reply.c  |    2 +-\r
+ notmuch-show.c   |   30 ++++++++++++++++++++++--------\r
+ 3 files changed, 25 insertions(+), 10 deletions(-)\r
+\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index 0c17b79..f930798 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -87,6 +87,7 @@ typedef struct notmuch_crypto {\r
+ typedef struct notmuch_show_params {\r
+     notmuch_bool_t entire_thread;\r
+     notmuch_bool_t omit_excluded;\r
++    notmuch_bool_t output_body;\r
+     notmuch_bool_t raw;\r
+     int part;\r
+     notmuch_crypto_t crypto;\r
+@@ -176,7 +177,7 @@ notmuch_status_t\r
+ show_one_part (const char *filename, int part);\r
+ \r
+ void\r
+-format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first);\r
++format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first, notmuch_bool_t output_body);\r
+ \r
+ void\r
+ format_headers_json (const void *ctx, GMimeMessage *message, notmuch_bool_t reply);\r
+diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+index 3a038ed..de21f3b 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -620,7 +620,7 @@ notmuch_reply_format_json(void *ctx,\r
+     /* Start the original */\r
+     printf (", \"original\": ");\r
+ \r
+-    format_part_json (ctx, node, TRUE);\r
++    format_part_json (ctx, node, TRUE, TRUE);\r
+ \r
+     /* End */\r
+     printf ("}\n");\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 8f3c60e..d3419e4 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -559,7 +559,7 @@ format_part_text (const void *ctx, mime_node_t *node,\r
+ }\r
+ \r
+ void\r
+-format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\r
++format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first, notmuch_bool_t output_body)\r
+ {\r
+     /* Any changes to the JSON format should be reflected in the file\r
+      * devel/schemata. */\r
+@@ -571,10 +571,12 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\r
+       printf ("\"headers\": ");\r
+       format_headers_json (ctx, GMIME_MESSAGE (node->part), FALSE);\r
+ \r
+-      printf (", \"body\": [");\r
+-      format_part_json (ctx, mime_node_child (node, 0), first);\r
+-\r
+-      printf ("]}");\r
++      if (output_body) {\r
++          printf (", \"body\": [");\r
++          format_part_json (ctx, mime_node_child (node, 0), first, TRUE);\r
++          printf ("]");\r
++      }\r
++      printf ("}");\r
+       return;\r
+     }\r
+ \r
+@@ -652,16 +654,16 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\r
+     talloc_free (local);\r
+ \r
+     for (i = 0; i < node->nchildren; i++)\r
+-      format_part_json (ctx, mime_node_child (node, i), i == 0);\r
++      format_part_json (ctx, mime_node_child (node, i), i == 0, TRUE);\r
+ \r
+     printf ("%s}", terminator);\r
+ }\r
+ \r
+ static notmuch_status_t\r
+ format_part_json_entry (const void *ctx, mime_node_t *node, unused (int indent),\r
+-                      unused (const notmuch_show_params_t *params))\r
++                      const notmuch_show_params_t *params)\r
+ {\r
+-    format_part_json (ctx, node, TRUE);\r
++    format_part_json (ctx, node, TRUE, params->output_body);\r
+ \r
+     return NOTMUCH_STATUS_SUCCESS;\r
+ }\r
+@@ -1004,6 +1006,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+     notmuch_show_params_t params = {\r
+       .part = -1,\r
+       .omit_excluded = TRUE,\r
++      .output_body = TRUE,\r
+       .crypto = {\r
+           .verify = FALSE,\r
+           .decrypt = FALSE\r
+@@ -1032,6 +1035,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+       { NOTMUCH_OPT_INT, &params.part, "part", 'p', 0 },\r
+       { NOTMUCH_OPT_BOOLEAN, &params.crypto.decrypt, "decrypt", 'd', 0 },\r
+       { NOTMUCH_OPT_BOOLEAN, &params.crypto.verify, "verify", 'v', 0 },\r
++      { NOTMUCH_OPT_BOOLEAN, &params.output_body, "body", 'b', 0 },\r
+       { 0, 0, 0, 0, 0 }\r
+     };\r
+ \r
+@@ -1086,6 +1090,16 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+           entire_thread = ENTIRE_THREAD_FALSE;\r
+     }\r
+ \r
++    if (!params.output_body) {\r
++      if (params.part > 0) {\r
++          fprintf (stderr, "Warning: --body=false is incompatible with --part > 0. Disabling.\n");\r
++          params.output_body = TRUE;\r
++      } else {\r
++          if (format != &format_json)\r
++              fprintf (stderr, "Warning: --body=false only implemented for format=json\n");\r
++      }\r
++    }\r
++\r
+     if (entire_thread == ENTIRE_THREAD_TRUE)\r
+       params.entire_thread = TRUE;\r
+     else\r
+-- \r
+1.7.9.1\r
+\r