aboutsummaryrefslogtreecommitdiffhomepage
path: root/notmuch-show.c
diff options
context:
space:
mode:
authorMark Walters <markwalters1009@gmail.com>2012-07-24 19:23:27 +0100
committerDavid Bremner <bremner@debian.org>2012-07-24 15:29:22 -0300
commit0e63372efe28f2fff0791b293240695b19bfefd2 (patch)
tree3fc236352568968dd10ceea953f54a83a2734caa /notmuch-show.c
parent10ab2b57039d7ef06c82749530ff48675e81d16d (diff)
cli: add --body=true|false option to notmuch-show.c
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.
Diffstat (limited to 'notmuch-show.c')
-rw-r--r--notmuch-show.c30
1 files changed, 22 insertions, 8 deletions
diff --git a/notmuch-show.c b/notmuch-show.c
index 8f3c60e9..d3419e4e 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, &params.part, "part", 'p', 0 },
{ NOTMUCH_OPT_BOOLEAN, &params.crypto.decrypt, "decrypt", 'd', 0 },
{ NOTMUCH_OPT_BOOLEAN, &params.crypto.verify, "verify", 'v', 0 },
+ { NOTMUCH_OPT_BOOLEAN, &params.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