Normally notmuch show includes any text/* parts (except text/html) in
the output. This option allows the caller to suppress this behaviour.
This is used by notmuch-pick.el (although not needed) because it gives
a speed-up of at least a factor of a two; moreover it reduces the
memory usage in emacs hugely.
This commit just implements it for --format-json. The next commit adds
it for --format=text. The option does not make sense for --format=raw
or --format=mbox.
---
This patch is a little bigger than I would like but a lot of it is code
movement.
notmuch-client.h | 3 ++-
notmuch-reply.c | 2 +-
notmuch-show.c | 44 +++++++++++++++++++++++++-------------------
3 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/notmuch-client.h b/notmuch-client.h
index 0c17b79..edb356d 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 include_text_content;
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 include_text_content);
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..35e3f22 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 include_text_content)
{
/* Any changes to the JSON format should be reflected in the file
* devel/schemata. */
@@ -572,7 +572,7 @@ format_part_json (const void *ctx, mime_node_t *node,
notmuch_bool_t first)
format_headers_json (ctx, GMIME_MESSAGE (node->part), FALSE);
printf (", \"body\": [");
- format_part_json (ctx, mime_node_child (node, 0), first);
+ format_part_json (ctx, mime_node_child (node, 0), first,
include_text_content);
printf ("]}");
return;
@@ -623,19 +623,21 @@ format_part_json (const void *ctx, mime_node_t *node,
notmuch_bool_t first)
* makes charset decoding the responsibility on the caller, we
* report the charset for text/html parts.
*/
- if (g_mime_content_type_is_type (content_type, "text", "html")) {
- const char *content_charset =
g_mime_object_get_content_type_parameter (meta, "charset");
-
- if (content_charset != NULL)
- printf (", \"content-charset\": %s", json_quote_str (local,
content_charset));
- } else if (g_mime_content_type_is_type (content_type, "text", "*")) {
- GMimeStream *stream_memory = g_mime_stream_mem_new ();
- GByteArray *part_content;
- show_text_part_content (node->part, stream_memory, 0);
- part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM
(stream_memory));
-
- printf (", \"content\": %s", json_quote_chararray (local, (char *)
part_content->data, part_content->len));
- g_object_unref (stream_memory);
+ if (g_mime_content_type_is_type (content_type, "text", "*")) {
+ if (g_mime_content_type_is_type (content_type, "text", "html") ||
!include_text_content) {
+ const char *content_charset =
g_mime_object_get_content_type_parameter (meta, "charset");
+
+ if (content_charset != NULL)
+ printf (", \"content-charset\": %s", json_quote_str (local,
content_charset));
+ } else {
+ GMimeStream *stream_memory = g_mime_stream_mem_new ();
+ GByteArray *part_content;
+ show_text_part_content (node->part, stream_memory, 0);
+ part_content = g_mime_stream_mem_get_byte_array
(GMIME_STREAM_MEM (stream_memory));
+
+ printf (", \"content\": %s", json_quote_chararray (local, (char
*) part_content->data, part_content->len));
+ g_object_unref (stream_memory);
+ }
}
} else if (GMIME_IS_MULTIPART (node->part)) {
printf (", \"content\": [");
@@ -652,17 +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,
include_text_content);
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->include_text_content);
return NOTMUCH_STATUS_SUCCESS;
}
@@ -1004,6 +1005,7 @@ notmuch_show_command (void *ctx, unused (int argc),
unused (char *argv[]))
notmuch_show_params_t params = {
.part = -1,
.omit_excluded = TRUE,
+ .include_text_content = TRUE,
.crypto = {
.verify = FALSE,
.decrypt = FALSE
@@ -1032,6 +1034,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.include_text_content,
"include-text-content", 'h', 0 },
{ 0, 0, 0, 0, 0 }
};
@@ -1086,6 +1089,9 @@ notmuch_show_command (void *ctx, unused (int argc),
unused (char *argv[]))
entire_thread = ENTIRE_THREAD_FALSE;
}
+ if (!params.include_text_content && (format == &format_mbox || format ==
&format_raw))
+ fprintf (stderr, "Warning: --include_text_content=false only makes
sense for format=json and format=text\n");
+
if (entire_thread == ENTIRE_THREAD_TRUE)
params.entire_thread = TRUE;
else
--
1.7.9.1
