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

diff --git a/a3/53ee9c36a1cda0cf69ae889360ca5391ebf1f5 b/a3/53ee9c36a1cda0cf69ae889360ca5391ebf1f5
new file mode 100644 (file)
index 0000000..97ebef2
--- /dev/null
+++ b/a3/53ee9c36a1cda0cf69ae889360ca5391ebf1f5
@@ -0,0 +1,211 @@
+Return-Path: <amdragon@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 BBBAB431FAF\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Jul 2012 09:43:57 -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 R4TRyH-Cwbkz for <notmuch@notmuchmail.org>;\r
+       Mon, 23 Jul 2012 09:43:56 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
+       [18.9.25.15])\r
+       by olra.theworths.org (Postfix) with ESMTP id 2CC6C431FAE\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Jul 2012 09:43:56 -0700 (PDT)\r
+X-AuditID: 1209190f-b7f306d0000008b4-50-500d7f4babb3\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 30.D1.02228.B4F7D005; Mon, 23 Jul 2012 12:43:55 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q6NGhs9O020707; \r
+       Mon, 23 Jul 2012 12:43:55 -0400\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+       (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 q6NGhrAW020709\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Mon, 23 Jul 2012 12:43:54 -0400 (EDT)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1StLjd-0002fa-LA; Mon, 23 Jul 2012 12:43:53 -0400\r
+Date: Mon, 23 Jul 2012 12:43:53 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Mark Walters <markwalters1009@gmail.com>\r
+Subject: Re: [PATCH 1/4] cli: add --body=true|false option to notmuch-show.c\r
+Message-ID: <20120723164353.GG31834@mit.edu>\r
+References: <1343060241-18283-1-git-send-email-markwalters1009@gmail.com>\r
+       <1343060241-18283-2-git-send-email-markwalters1009@gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <1343060241-18283-2-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpileLIzCtJLcpLzFFi42IR4hTV1vWu5w0weNKsbrF6Lo/F9ZszmR2Y\r
+       PHbOusvu8WzVLeYApigum5TUnMyy1CJ9uwSujMvt99kKXqhVvJ39l6WBcYtcFyMnh4SAicT3\r
+       uQtZIGwxiQv31rN1MXJxCAnsY5T4Mf82M4SzgVFi864FLBDOSSaJWe/2sUI4SxglOrZPZ+9i\r
+       5OBgEVCVaDjEDzKKTUBDYtv+5YwgtoiAjsTtQwvYQWxmAWmJb7+bmUBsYQEfiQWLv7CBtPIC\r
+       1ey5xgMxspNRoufmf2aQGl4BQYmTM5+wQPRqSdz495IJpB5kzvJ/HCBhTgEvieOzfoGViwqo\r
+       SEw5uY1tAqPQLCTds5B0z0LoXsDIvIpRNiW3Sjc3MTOnODVZtzg5MS8vtUjXRC83s0QvNaV0\r
+       EyM4qCX5dzB+O6h0iFGAg1GJh9eqiidAiDWxrLgy9xCjJAeTkiivaAVvgBBfUn5KZUZicUZ8\r
+       UWlOavEhRgkOZiUR3tXVQDnelMTKqtSifJiUNAeLkjjv1ZSb/kIC6YklqdmpqQWpRTBZGQ4O\r
+       JQle3TqgRsGi1PTUirTMnBKENBMHJ8hwHqDh3iA1vMUFibnFmekQ+VOMilLivFIgCQGQREZp\r
+       HlwvLOm8YhQHekWYNw6kigeYsOC6XwENZgIaLJ3FBTK4JBEhJdXAGG1/WzZ7t9T3aZ8lF+/8\r
+       f+1LTsE58x7/8sazH1qfbfbUjC0vXLzEs0nJpKdUlvnPHR/GcGvvcgeGSJvky1aaHeEf1f7m\r
+       yVamL/3+8AzrRn7HvewHu0I/pK42/rHp4wYrnh9ZGp21bfMOmO/iF0jM6+pXnDjnctHytQUp\r
+       J//O4ecoKWCJDa9TYinOSDTUYi4qTgQA68HV0BUDAAA=\r
+Cc: notmuch@notmuchmail.org\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 16:43:57 -0000\r
+\r
+Quoth Mark Walters on Jul 23 at  5:17 pm:\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   |   23 +++++++++++++++--------\r
+>  3 files changed, 18 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..c2ad4fb 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", 'h', 0 },\r
+\r
+Why 'h' for the short option?\r
+\r
+>      { 0, 0, 0, 0, 0 }\r
+>      };\r
+>  \r
+> @@ -1086,6 +1090,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+>          entire_thread = ENTIRE_THREAD_FALSE;\r
+>      }\r
+>  \r
+> +    if (!params.output_body && format != &format_json)\r
+> +    fprintf (stderr,"Warning: --body=false only implemented for format=json\n");\r
+\r
+Missing space after comma.\r
+\r
+Should we consider how --part and --body interact?  Maybe specifying\r
+--part is incompatible with --body=false?  Or specifying a part > 0 is\r
+incompatible with --body=false?\r
+\r
+> +\r
+>      if (entire_thread == ENTIRE_THREAD_TRUE)\r
+>      params.entire_thread = TRUE;\r
+>      else\r