From 92470c9d5fa1be24568e985dedb26476363d37e5 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Tue, 24 Jul 2012 19:23:27 +0100 Subject: [PATCH] [PATCH v2 (rebased) 1/4] cli: add --body=true|false option to notmuch-show.c --- f3/13c46f430969aea138658e34813dc96baa50a4 | 196 ++++++++++++++++++++++ 1 file changed, 196 insertions(+) create mode 100644 f3/13c46f430969aea138658e34813dc96baa50a4 diff --git a/f3/13c46f430969aea138658e34813dc96baa50a4 b/f3/13c46f430969aea138658e34813dc96baa50a4 new file mode 100644 index 000000000..509ffa83d --- /dev/null +++ b/f3/13c46f430969aea138658e34813dc96baa50a4 @@ -0,0 +1,196 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 64667431FB6 + for ; Tue, 24 Jul 2012 11:25:27 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id CwHUuHkNOCZQ for ; + Tue, 24 Jul 2012 11:25:26 -0700 (PDT) +Received: from mail-we0-f181.google.com (mail-we0-f181.google.com + [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 911A4431FAF + for ; Tue, 24 Jul 2012 11:25:26 -0700 (PDT) +Received: by weyt57 with SMTP id t57so5939479wey.26 + for ; Tue, 24 Jul 2012 11:25:25 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=sUC2MJN5l21g6QXsVIox02OmEDjessR4wrfOjX1eHQM=; + b=vZH7MNwQ9HOhYfk9ehFBxubbkUDijz7ECTzrW7fN/IUdLZRsaXXLBIWDlCIRcQMtPy + 1jK1w1q1/ty97I253uZr/9prTIXJC5LZ0xldzI30ouJUs0Jl1+MG3QgU7j14iJLi0HVF + sD/cBZFGKcL355REOvOFx0Akj1eeePvKTlWgi3AZuLIsxzYNxNdQyhBW3ML2e3KmUrTT + HE7LQiwfKK4oRv006VO/mODXS8i1+5a8c/tGoRqhzn3Omsj2KMJ31/EbnoBN9I8KMU4i + PJa7NN+ZYWCAQ7ZCZYbuGRAsJM879S8wqMpOCgWRavIpCsFV3/BsE2RUT9zRSboazsRy + mjjQ== +Received: by 10.180.98.200 with SMTP id ek8mr9300914wib.0.1343154325324; + Tue, 24 Jul 2012 11:25:25 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + fb20sm8548148wid.1.2012.07.24.11.25.23 (version=TLSv1/SSLv3 cipher=OTHER); + Tue, 24 Jul 2012 11:25:24 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v2 (rebased) 1/4] cli: add --body=true|false option to + notmuch-show.c +Date: Tue, 24 Jul 2012 19:23:27 +0100 +Message-Id: <1343154210-26841-2-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1343154210-26841-1-git-send-email-markwalters1009@gmail.com> +References: <1343154210-26841-1-git-send-email-markwalters1009@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 24 Jul 2012 18:25:27 -0000 + +This option allows the caller to suppress the output of the bodies of +the messages. Currently this is only implemented for format=json. + +This is used by notmuch-pick.el (although not needed) because it gives +a speed-up of at least a factor of a two (and in some cases a speed up +of more than a factor of 8); moreover it reduces the memory usage in +emacs hugely. +--- + notmuch-client.h | 3 ++- + notmuch-reply.c | 2 +- + notmuch-show.c | 30 ++++++++++++++++++++++-------- + 3 files changed, 25 insertions(+), 10 deletions(-) + +diff --git a/notmuch-client.h b/notmuch-client.h +index 0c17b79..f930798 100644 +--- a/notmuch-client.h ++++ b/notmuch-client.h +@@ -87,6 +87,7 @@ typedef struct notmuch_crypto { + typedef struct notmuch_show_params { + notmuch_bool_t entire_thread; + notmuch_bool_t omit_excluded; ++ notmuch_bool_t output_body; + notmuch_bool_t raw; + int part; + notmuch_crypto_t crypto; +@@ -176,7 +177,7 @@ notmuch_status_t + show_one_part (const char *filename, int part); + + void +-format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first); ++format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first, notmuch_bool_t output_body); + + void + format_headers_json (const void *ctx, GMimeMessage *message, notmuch_bool_t reply); +diff --git a/notmuch-reply.c b/notmuch-reply.c +index 3a038ed..de21f3b 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -620,7 +620,7 @@ notmuch_reply_format_json(void *ctx, + /* Start the original */ + printf (", \"original\": "); + +- format_part_json (ctx, node, TRUE); ++ format_part_json (ctx, node, TRUE, TRUE); + + /* End */ + printf ("}\n"); +diff --git a/notmuch-show.c b/notmuch-show.c +index 8f3c60e..d3419e4 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -559,7 +559,7 @@ format_part_text (const void *ctx, mime_node_t *node, + } + + void +-format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first) ++format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first, notmuch_bool_t output_body) + { + /* Any changes to the JSON format should be reflected in the file + * devel/schemata. */ +@@ -571,10 +571,12 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first) + printf ("\"headers\": "); + format_headers_json (ctx, GMIME_MESSAGE (node->part), FALSE); + +- printf (", \"body\": ["); +- format_part_json (ctx, mime_node_child (node, 0), first); +- +- printf ("]}"); ++ if (output_body) { ++ printf (", \"body\": ["); ++ format_part_json (ctx, mime_node_child (node, 0), first, TRUE); ++ printf ("]"); ++ } ++ printf ("}"); + return; + } + +@@ -652,16 +654,16 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first) + talloc_free (local); + + for (i = 0; i < node->nchildren; i++) +- format_part_json (ctx, mime_node_child (node, i), i == 0); ++ format_part_json (ctx, mime_node_child (node, i), i == 0, TRUE); + + printf ("%s}", terminator); + } + + static notmuch_status_t + format_part_json_entry (const void *ctx, mime_node_t *node, unused (int indent), +- unused (const notmuch_show_params_t *params)) ++ const notmuch_show_params_t *params) + { +- format_part_json (ctx, node, TRUE); ++ format_part_json (ctx, node, TRUE, params->output_body); + + return NOTMUCH_STATUS_SUCCESS; + } +@@ -1004,6 +1006,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + notmuch_show_params_t params = { + .part = -1, + .omit_excluded = TRUE, ++ .output_body = TRUE, + .crypto = { + .verify = FALSE, + .decrypt = FALSE +@@ -1032,6 +1035,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + { NOTMUCH_OPT_INT, ¶ms.part, "part", 'p', 0 }, + { NOTMUCH_OPT_BOOLEAN, ¶ms.crypto.decrypt, "decrypt", 'd', 0 }, + { NOTMUCH_OPT_BOOLEAN, ¶ms.crypto.verify, "verify", 'v', 0 }, ++ { NOTMUCH_OPT_BOOLEAN, ¶ms.output_body, "body", 'b', 0 }, + { 0, 0, 0, 0, 0 } + }; + +@@ -1086,6 +1090,16 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + entire_thread = ENTIRE_THREAD_FALSE; + } + ++ if (!params.output_body) { ++ if (params.part > 0) { ++ fprintf (stderr, "Warning: --body=false is incompatible with --part > 0. Disabling.\n"); ++ params.output_body = TRUE; ++ } else { ++ if (format != &format_json) ++ fprintf (stderr, "Warning: --body=false only implemented for format=json\n"); ++ } ++ } ++ + if (entire_thread == ENTIRE_THREAD_TRUE) + params.entire_thread = TRUE; + else +-- +1.7.9.1 + -- 2.26.2