unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
* [PATCH 1/4] show: indicate length of omitted body content (json)
@ 2012-08-05  7:22 Peter Wang
  2012-08-05  7:22 ` [PATCH 2/4] test: conform to content-length fields (json) Peter Wang
                   ` (7 more replies)
  0 siblings, 8 replies; 14+ messages in thread
From: Peter Wang @ 2012-08-05  7:22 UTC (permalink / raw)
  To: notmuch

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

^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2012-10-20  1:56 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-05  7:22 [PATCH 1/4] show: indicate length of omitted body content (json) Peter Wang
2012-08-05  7:22 ` [PATCH 2/4] test: conform to content-length fields (json) Peter Wang
2012-08-05  7:22 ` [PATCH 3/4] show: indicate length of omitted body content (text) Peter Wang
2012-08-06 16:50   ` Austin Clements
2012-08-05  7:22 ` [PATCH 4/4] test: conform to content-length fields (text) Peter Wang
2012-08-05  9:32 ` [PATCH 1/4] show: indicate length of omitted body content (json) Tomi Ollila
2012-08-05 21:37 ` Jameson Graef Rollins
2012-08-06 14:36   ` Peter Wang
2012-08-06 16:47 ` Austin Clements
2012-08-07 13:24   ` Peter Wang
2012-08-07 13:57     ` Austin Clements
2012-08-07 23:01 ` Mark Walters
2012-08-08 12:31   ` Peter Wang
2012-10-20  1:56 ` Ethan Glasser-Camp

Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).