From: Jani Nikula <jani@nikula.org>
To: Adam Wolfe Gordon <awg+notmuch@xvx.ca>, notmuch@notmuchmail.org
Subject: Re: [PATCH v6 02/10] reply: Factor out reply creation
Date: Fri, 09 Mar 2012 00:05:08 +0200 [thread overview]
Message-ID: <87obs692az.fsf@nikula.org> (raw)
In-Reply-To: <1329893199-21630-3-git-send-email-awg+notmuch@xvx.ca>
On Tue, 21 Feb 2012 23:46:31 -0700, Adam Wolfe Gordon <awg+notmuch@xvx.ca> wrote:
> Factor out the creation of a reply message based on an original
> message so it can be shared by different reply formats.
> ---
> notmuch-reply.c | 101 +++++++++++++++++++++++++++++++-----------------------
> 1 files changed, 58 insertions(+), 43 deletions(-)
>
> diff --git a/notmuch-reply.c b/notmuch-reply.c
> index 6b244e6..8e56245 100644
> --- a/notmuch-reply.c
> +++ b/notmuch-reply.c
> @@ -505,6 +505,61 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message
> return NULL;
> }
>
> +static GMimeMessage *
> +create_reply_message(void *ctx,
> + notmuch_config_t *config,
> + notmuch_message_t *message,
> + notmuch_bool_t reply_all)
> +{
> + const char *subject, *from_addr = NULL;
> + const char *in_reply_to, *orig_references, *references;
> +
> + /* The 1 means we want headers in a "pretty" order. */
> + GMimeMessage *reply = g_mime_message_new (1);
> + if (reply == NULL) {
> + fprintf (stderr, "Out of memory\n");
> + return NULL;
> + }
> +
> + subject = notmuch_message_get_header (message, "subject");
> + if (subject) {
> + if (strncasecmp (subject, "Re:", 3))
> + subject = talloc_asprintf (ctx, "Re: %s", subject);
> + g_mime_message_set_subject (reply, subject);
> + }
> +
> + from_addr = add_recipients_from_message (reply, config,
> + message, reply_all);
> +
> + if (from_addr == NULL)
> + from_addr = guess_from_received_header (config, message);
> +
> + if (from_addr == NULL)
> + from_addr = notmuch_config_get_user_primary_email (config);
> +
> + from_addr = talloc_asprintf (ctx, "%s <%s>",
> + notmuch_config_get_user_name (config),
> + from_addr);
> + g_mime_object_set_header (GMIME_OBJECT (reply),
> + "From", from_addr);
> +
> + in_reply_to = talloc_asprintf (ctx, "<%s>",
> + notmuch_message_get_message_id (message));
> +
> + g_mime_object_set_header (GMIME_OBJECT (reply),
> + "In-Reply-To", in_reply_to);
> +
> + orig_references = notmuch_message_get_header (message, "references");
> + references = talloc_asprintf (ctx, "%s%s%s",
> + orig_references ? orig_references : "",
> + orig_references ? " " : "",
> + in_reply_to);
> + g_mime_object_set_header (GMIME_OBJECT (reply),
> + "References", references);
> +
> + return reply;
> +}
> +
> static int
> notmuch_reply_format_default(void *ctx,
> notmuch_config_t *config,
> @@ -515,8 +570,6 @@ notmuch_reply_format_default(void *ctx,
> GMimeMessage *reply;
> notmuch_messages_t *messages;
> notmuch_message_t *message;
> - const char *subject, *from_addr = NULL;
> - const char *in_reply_to, *orig_references, *references;
> const notmuch_show_format_t *format = &format_reply;
>
> for (messages = notmuch_query_search_messages (query);
> @@ -525,48 +578,10 @@ notmuch_reply_format_default(void *ctx,
> {
> message = notmuch_messages_get (messages);
>
> - /* The 1 means we want headers in a "pretty" order. */
> - reply = g_mime_message_new (1);
> - if (reply == NULL) {
> - fprintf (stderr, "Out of memory\n");
> - return 1;
> - }
> -
> - subject = notmuch_message_get_header (message, "subject");
> - if (subject) {
> - if (strncasecmp (subject, "Re:", 3))
> - subject = talloc_asprintf (ctx, "Re: %s", subject);
> - g_mime_message_set_subject (reply, subject);
> - }
> -
> - from_addr = add_recipients_from_message (reply, config, message,
> - reply_all);
> + reply = create_reply_message (ctx, config, message, reply_all);
>
> - if (from_addr == NULL)
> - from_addr = guess_from_received_header (config, message);
> -
> - if (from_addr == NULL)
> - from_addr = notmuch_config_get_user_primary_email (config);
> -
> - from_addr = talloc_asprintf (ctx, "%s <%s>",
> - notmuch_config_get_user_name (config),
> - from_addr);
> - g_mime_object_set_header (GMIME_OBJECT (reply),
> - "From", from_addr);
> -
> - in_reply_to = talloc_asprintf (ctx, "<%s>",
> - notmuch_message_get_message_id (message));
> -
> - g_mime_object_set_header (GMIME_OBJECT (reply),
> - "In-Reply-To", in_reply_to);
> -
> - orig_references = notmuch_message_get_header (message, "references");
> - references = talloc_asprintf (ctx, "%s%s%s",
> - orig_references ? orig_references : "",
> - orig_references ? " " : "",
> - in_reply_to);
> - g_mime_object_set_header (GMIME_OBJECT (reply),
> - "References", references);
> + if (!reply)
> + continue;
This changes the existing behaviour, which was to abort on errors. Also,
"continue" here skips notmuch_message_destroy (message). With out of
memory being the only possible error here, perhaps it's just easiest to
abort instead of trying to go on?
BR,
Jani.
>
> show_reply_headers (reply);
>
> --
> 1.7.5.4
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
next prev parent reply other threads:[~2012-03-08 22:05 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-22 6:46 [PATCH v6 00/10] Reply improvements Adam Wolfe Gordon
2012-02-22 6:46 ` [PATCH v6 01/10] test: Add broken test for the new JSON reply format Adam Wolfe Gordon
2012-02-22 6:46 ` [PATCH v6 02/10] reply: Factor out reply creation Adam Wolfe Gordon
2012-03-08 22:05 ` Jani Nikula [this message]
2012-02-22 6:46 ` [PATCH v6 03/10] reply: Require that only one message is returned Adam Wolfe Gordon
2012-03-09 23:00 ` Jani Nikula
2012-03-10 18:29 ` Adam Wolfe Gordon
2012-03-12 0:29 ` Austin Clements
2012-02-22 6:46 ` [PATCH v6 04/10] TODO: Add replying to multiple messages Adam Wolfe Gordon
2012-02-22 6:46 ` [PATCH v6 05/10] reply: Add a JSON reply format Adam Wolfe Gordon
2012-03-09 23:08 ` Jani Nikula
2012-03-10 18:27 ` Adam Wolfe Gordon
2012-02-22 6:46 ` [PATCH v6 06/10] schemata: Add documentation for " Adam Wolfe Gordon
2012-03-12 0:36 ` Austin Clements
2012-03-12 4:09 ` Adam Wolfe Gordon
2012-03-12 20:57 ` Austin Clements
2012-02-22 6:46 ` [PATCH v6 07/10] man: Update notmuch-reply man page for JSON format Adam Wolfe Gordon
2012-02-22 6:46 ` [PATCH v6 08/10] emacs: Factor out useful functions into notmuch-lib Adam Wolfe Gordon
2012-02-22 6:46 ` [PATCH v6 09/10] test: Add broken tests for new emacs reply functionality Adam Wolfe Gordon
2012-02-22 6:46 ` [PATCH v6] emacs: Use the new JSON reply format and message-cite-original Adam Wolfe Gordon
2012-03-09 23:13 ` Jani Nikula
2012-03-10 18:19 ` Adam Wolfe Gordon
2012-03-12 1:11 ` Austin Clements
2012-02-25 21:29 ` [PATCH v6 00/10] Reply improvements David Bremner
2012-02-25 22:25 ` Adam Wolfe Gordon
2012-02-26 0:23 ` Austin Clements
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=87obs692az.fsf@nikula.org \
--to=jani@nikula.org \
--cc=awg+notmuch@xvx.ca \
--cc=notmuch@notmuchmail.org \
/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).