Re: [PATCH] reply: Convert JSON format to use sprinter

diff --git a/a1/ee3b54acac29ead52dfd2b3d6f1ce4e7af426e b/a1/ee3b54acac29ead52dfd2b3d6f1ce4e7af426e
new file mode 100644 (file)
index 0000000..8aedee5
--- /dev/null
+++ b/a1/ee3b54acac29ead52dfd2b3d6f1ce4e7af426e
@@ -0,0 +1,129 @@
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1AE6E431FC0\r
+       for <notmuch@notmuchmail.org>; Tue,  7 Aug 2012 09:00:01 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id bd+dIXfZZyKq for <notmuch@notmuchmail.org>;\r
+       Tue,  7 Aug 2012 09:00:00 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 620D4431FAF\r
+       for <notmuch@notmuchmail.org>; Tue,  7 Aug 2012 09:00:00 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1SymCK-0003TN-Ht; Tue, 07 Aug 2012 16:59:59 +0100\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+       helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1SymCK-000262-6e; Tue, 07 Aug 2012 16:59:56 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] reply: Convert JSON format to use sprinter\r
+In-Reply-To: <1344344230-9937-1-git-send-email-amdragon@mit.edu>\r
+References: <1344344230-9937-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.13.2+96~g634443c (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Tue, 07 Aug 2012 16:59:49 +0100\r
+Message-ID: <87k3xabslm.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: efaa6eca1b9335628939c80835879687 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.8 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+       *      domain\r
+       *  0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 07 Aug 2012 16:00:01 -0000\r
+\r
+\r
+\r
+On Tue, 07 Aug 2012, Austin Clements <amdragon@MIT.EDU> wrote:\r
+> Almost all of reply was already being formatted using the sprinter.\r
+> This patch converts the top-level dictionary to use the sprinter\r
+> interface.\r
+> ---\r
+>\r
+> One last sprinter piece that had slipped through the cracks.\r
+\r
+Looks good to me +1\r
+\r
+Mark\r
+\r
+>\r
+>  notmuch-reply.c |    8 ++++----\r
+>  1 file changed, 4 insertions(+), 4 deletions(-)\r
+>\r
+> diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+> index fa6665f..e60a264 100644\r
+> --- a/notmuch-reply.c\r
+> +++ b/notmuch-reply.c\r
+> @@ -614,20 +614,20 @@ notmuch_reply_format_json(void *ctx,\r
+>      return 1;\r
+>  \r
+>      sp = sprinter_json_create (ctx, stdout);\r
+> +    sp->begin_map (sp);\r
+>  \r
+>      /* The headers of the reply message we've created */\r
+> -    printf ("{\"reply-headers\": ");\r
+> +    sp->map_key (sp, "reply-headers");\r
+>      format_headers_json (sp, reply, TRUE);\r
+>      g_object_unref (G_OBJECT (reply));\r
+>      reply = NULL;\r
+>  \r
+>      /* Start the original */\r
+> -    printf (", \"original\": ");\r
+> -\r
+> +    sp->map_key (sp, "original");\r
+>      format_part_json (ctx, sp, node, TRUE, TRUE);\r
+>  \r
+>      /* End */\r
+> -    printf ("}\n");\r
+> +    sp->end (sp);\r
+>      notmuch_message_destroy (message);\r
+>  \r
+>      return 0;\r
+> -- \r
+> 1.7.10\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r