[PATCH] reply: Convert JSON format to use sprinter

diff --git a/70/08fca0bcf8d8804eb0c14241fbe537b5f4f2f0 b/70/08fca0bcf8d8804eb0c14241fbe537b5f4f2f0
new file mode 100644 (file)
index 0000000..796d8d0
--- /dev/null
+++ b/70/08fca0bcf8d8804eb0c14241fbe537b5f4f2f0
@@ -0,0 +1,112 @@
+Return-Path: <amdragon@mit.edu>\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 11BA5431FC4\r
+       for <notmuch@notmuchmail.org>; Tue,  7 Aug 2012 05:57:18 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 hJMiea4Twxw8 for <notmuch@notmuchmail.org>;\r
+       Tue,  7 Aug 2012 05:57:15 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+       [18.7.68.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id B2F09431FAF\r
+       for <notmuch@notmuchmail.org>; Tue,  7 Aug 2012 05:57:15 -0700 (PDT)\r
+X-AuditID: 12074424-b7fa06d0000008c2-d8-502110ab6a40\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id A1.BD.02242.BA011205; Tue,  7 Aug 2012 08:57:15 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q77CvE32024991; \r
+       Tue, 7 Aug 2012 08:57:14 -0400\r
+Received: from drake.dyndns.org\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q77CvDrq004545\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 7 Aug 2012 08:57:14 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1SyjLU-0002cg-Qf; Tue, 07 Aug 2012 08:57:12 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] reply: Convert JSON format to use sprinter\r
+Date: Tue,  7 Aug 2012 08:57:10 -0400\r
+Message-Id: <1344344230-9937-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsUixCmqrLtaQDHA4P1fcYvrN2cyOzB6PFt1\r
+       izmAMYrLJiU1J7MstUjfLoEr4+bKLqaCRxwVPbsvsDUwXmHrYuTgkBAwkWi4kdbFyAlkiklc\r
+       uLceKMzFISSwj1Hi4o5DzBDOekaJ6U/2QGUeMklsW3qCBaRFSGAuo8SMzYkgNpuAhsS2/csZ\r
+       QWwRAWmJnXdns4JsYBZQk/jTpQISFhawlvhz6hATiM0ioCrx8fdxMJtXwF6i+d0XVogr5CWe\r
+       3u9jm8DIu4CRYRWjbEpulW5uYmZOcWqybnFyYl5eapGuuV5uZoleakrpJkZQCLC7qOxgbD6k\r
+       dIhRgINRiYf3ApdCgBBrYllxZe4hRkkOJiVRXmE+xQAhvqT8lMqMxOKM+KLSnNTiQ4wSHMxK\r
+       IryHdwKV86YkVlalFuXDpKQ5WJTEea+n3PQXEkhPLEnNTk0tSC2CycpwcChJ8P7kBxoqWJSa\r
+       nlqRlplTgpBm4uAEGc4DNPwISA1vcUFibnFmOkT+FKOilDjve5CEAEgiozQPrhcWo68YxYFe\r
+       Eea9D1LFA4xvuO5XQIOZgAZ7y8uBDC5JREhJNTCumTDnTLAsm+38pO5znp/+pUvx/zNYnHI/\r
+       WTwrSMXk2Tltu9Z4ffbXb34a89x+YFPL5HJOd0PDpnOW19p/6uRvqGubcGBNuhmfXzNHbezu\r
+       Sg82seafVoYHVsa/O7x5/UpeyRMzzPn3TzlhvWnBs7up6Xw7HgjM5a61UFsvUMD098dyJx9F\r
+       1zQlluKMREMt5qLiRACINDE7rAIAAA==\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 12:57:18 -0000\r
+\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
+ 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