If a leaf part's body content is omitted, return the content length in
--format=json output. This information may be used by the consumer,
e.g. to decide whether to download a large attachment over a slow link.
---
devel/schemata | 5 ++++-
notmuch-show.c | 8 ++++++++
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/devel/schemata b/devel/schemata
index 9cb25f5..3df2764 100644
--- a/devel/schemata
+++ b/devel/schemata
@@ -69,7 +69,10 @@ part = {
# A leaf part's body content is optional, but may be included if
# it can be correctly encoded as a string. Consumers should use
# this in preference to fetching the part content separately.
- content?: string
+ content?: string,
+ # If a leaf part's body content is not included, the content-length
+ # may be included instead.
+ content-length?: int
}
# The headers of a message or part (format_headers_json with reply = FALSE)
diff --git a/notmuch-show.c b/notmuch-show.c
index 3556293..5c54257 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -664,6 +664,14 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,
sp->map_key (sp, "content");
sp->string_len (sp, (char *) part_content->data, part_content->len);
g_object_unref (stream_memory);
+ } else {
+ GMimeDataWrapper *wrapper = g_mime_part_get_content_object (GMIME_PART (node->part));
+ GMimeStream *stream = g_mime_data_wrapper_get_stream (wrapper);
+ ssize_t length = g_mime_stream_length (stream);
+ if (length >= 0) {
+ sp->map_key (sp, "content-length");
+ sp->integer (sp, length);
+ }
}
} else if (GMIME_IS_MULTIPART (node->part)) {
sp->map_key (sp, "content");
--
1.7.4.4