From: Tomi Ollila <tomi.ollila@iki.fi>
To: Peter Wang <novalazy@gmail.com>, notmuch@notmuchmail.org
Subject: Re: [PATCH 1/4] show: indicate length of omitted body content (json)
Date: Sun, 05 Aug 2012 12:32:22 +0300 [thread overview]
Message-ID: <m21ujladll.fsf@guru.guru-group.fi> (raw)
In-Reply-To: <1344151345-25411-1-git-send-email-novalazy@gmail.com>
On Sun, Aug 05 2012, Peter Wang <novalazy@gmail.com> wrote:
> 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.
> ---
Code looks good to me and tests pass. So I am not against pushing...
Tomi
> 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
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
next prev parent reply other threads:[~2012-08-05 9:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Tomi Ollila [this message]
2012-08-05 21:37 ` [PATCH 1/4] show: indicate length of omitted body content (json) 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m21ujladll.fsf@guru.guru-group.fi \
--to=tomi.ollila@iki.fi \
--cc=notmuch@notmuchmail.org \
--cc=novalazy@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).