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.
typedef struct notmuch_show_params {
notmuch_bool_t entire_thread;
notmuch_bool_t omit_excluded;
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;
notmuch_bool_t raw;
int part;
notmuch_crypto_t crypto;
show_one_part (const char *filename, int part);
void
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);
void
format_headers_json (const void *ctx, GMimeMessage *message, notmuch_bool_t reply);
/* Start the original */
printf (", \"original\": ");
/* Start the original */
printf (", \"original\": ");
- format_part_json (ctx, node, TRUE);
+ format_part_json (ctx, node, TRUE, TRUE);
/* End */
printf ("}\n");
/* End */
printf ("}\n");
-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. */
{
/* Any changes to the JSON format should be reflected in the file
* devel/schemata. */
printf ("\"headers\": ");
format_headers_json (ctx, GMIME_MESSAGE (node->part), FALSE);
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 ("}");
talloc_free (local);
for (i = 0; i < node->nchildren; i++)
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),
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;
}
return NOTMUCH_STATUS_SUCCESS;
}
notmuch_show_params_t params = {
.part = -1,
.omit_excluded = TRUE,
notmuch_show_params_t params = {
.part = -1,
.omit_excluded = TRUE,
.crypto = {
.verify = FALSE,
.decrypt = FALSE
.crypto = {
.verify = FALSE,
.decrypt = FALSE
{ 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_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 },
entire_thread = ENTIRE_THREAD_FALSE;
}
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
if (entire_thread == ENTIRE_THREAD_TRUE)
params.entire_thread = TRUE;
else