[PATCH 04/13] show: Associate an sprinter with each format

diff --git a/92/ac938014bc8189bbafcc5756af1f73cc4204d8 b/92/ac938014bc8189bbafcc5756af1f73cc4204d8
new file mode 100644 (file)
index 0000000..725f28a
--- /dev/null
+++ b/92/ac938014bc8189bbafcc5756af1f73cc4204d8
@@ -0,0 +1,161 @@
+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 703C3431FD7\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 19:35:06 -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 grFAm2dARKrt for <notmuch@notmuchmail.org>;\r
+       Tue, 24 Jul 2012 19:35:05 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
+       [18.7.68.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 83B10431FAE\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 19:35:05 -0700 (PDT)\r
+X-AuditID: 12074422-b7f1f6d00000090b-01-500f5b5986a8\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 7C.71.02315.95B5F005; Tue, 24 Jul 2012 22:35:05 -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 q6P2Z4Wj011170; \r
+       Tue, 24 Jul 2012 22:35:04 -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 q6P2Z2MJ025121\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 24 Jul 2012 22:35:04 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1StrRG-0004Zn-Au; Tue, 24 Jul 2012 22:35:02 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 04/13] show: Associate an sprinter with each format\r
+Date: Tue, 24 Jul 2012 22:34:44 -0400\r
+Message-Id: <1343183693-17134-5-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1343183693-17134-1-git-send-email-amdragon@mit.edu>\r
+References: <1343183693-17134-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixCmqrBsZzR9gcOUZp8XehnZGi+s3ZzI7\r
+       MHks3rSfzePZqlvMAUxRXDYpqTmZZalF+nYJXBl3J8oUXBKvWHTgMHMD4yuhLkZODgkBE4nH\r
+       tyYzQdhiEhfurWfrYuTiEBLYxyix4NECVghnA6PE7GczmSGcR0wSHWevskM4c4HKPi1gBOln\r
+       E9CQ2LZ/OZgtIiAtsfPubFYQm1nATGLuz4lsILawgLPE3vY/YDaLgKrE1YbjzCA2r4CDxJV5\r
+       V5gh7pCXeHq/D6yGU8BR4vyShWAzhYBqehZfY5/AyL+AkWEVo2xKbpVubmJmTnFqsm5xcmJe\r
+       XmqRrqlebmaJXmpK6SZGUCixuyjtYPx5UOkQowAHoxIP788nfAFCrIllxZW5hxglOZiURHkr\r
+       gvkDhPiS8lMqMxKLM+KLSnNSiw8xSnAwK4nwFoUB5XhTEiurUovyYVLSHCxK4rzXUm76Cwmk\r
+       J5akZqemFqQWwWRlODiUJHhbo4AaBYtS01Mr0jJzShDSTBycIMN5gIazgtTwFhck5hZnpkPk\r
+       TzEqSonzaoMkBEASGaV5cL2wWH/FKA70ijBvM0gVDzBNwHW/AhrMBDT4eRgfyOCSRISUVANj\r
+       zInwRdEXXqSJ7GOZLWIbW7Dxzec9D9nOVbFc2ZRna/SB0WvGlcRV037bbw+/Uii/oVvHY0ou\r
+       +0fBNzMqurgrTtnaVD6VFZhotKFv/0rp/PNfs//ZfzqzMMXued5Hr4sVn5/XX+/r3holaP3B\r
+       eNJ0kcyZdrMfxqw3fCHRc8HqBaOSSfvMcO8DSizFGYmGWsxFxYkALSZ+DNACAAA=\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: Wed, 25 Jul 2012 02:35:06 -0000\r
+\r
+This associates an sprinter constructor with each show format and uses\r
+this to construct the appropriate sprinter.  Currently nothing is done\r
+with this sprinter, but the following patches will weave it through\r
+the layers of notmuch show.\r
+---\r
+ notmuch-client.h |    2 ++\r
+ notmuch-show.c   |    9 +++++++++\r
+ 2 files changed, 11 insertions(+)\r
+\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index f930798..e4172a2 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -66,9 +66,11 @@ typedef GMimeCipherContext notmuch_crypto_context_t;\r
+ #define STRINGIFY_(s) #s\r
+ \r
+ typedef struct mime_node mime_node_t;\r
++typedef struct sprinter sprinter_t;\r
+ struct notmuch_show_params;\r
+ \r
+ typedef struct notmuch_show_format {\r
++    sprinter_t *(*new_sprinter) (const void *ctx, FILE *stream);\r
+     const char *message_set_start;\r
+     notmuch_status_t (*part) (const void *ctx,\r
+                             struct mime_node *node, int indent,\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index d3419e4..d04943f 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -20,12 +20,14 @@\r
+ \r
+ #include "notmuch-client.h"\r
+ #include "gmime-filter-reply.h"\r
++#include "sprinter.h"\r
+ \r
+ static notmuch_status_t\r
+ format_part_text (const void *ctx, mime_node_t *node,\r
+                 int indent, const notmuch_show_params_t *params);\r
+ \r
+ static const notmuch_show_format_t format_text = {\r
++    .new_sprinter = sprinter_text_create,\r
+     .part = format_part_text,\r
+ };\r
+ \r
+@@ -34,6 +36,7 @@ format_part_json_entry (const void *ctx, mime_node_t *node,\r
+                       int indent, const notmuch_show_params_t *params);\r
+ \r
+ static const notmuch_show_format_t format_json = {\r
++    .new_sprinter = sprinter_json_create,\r
+     .message_set_start = "[",\r
+     .part = format_part_json_entry,\r
+     .message_set_sep = ", ",\r
+@@ -46,6 +49,7 @@ format_part_mbox (const void *ctx, mime_node_t *node,\r
+                 int indent, const notmuch_show_params_t *params);\r
+ \r
+ static const notmuch_show_format_t format_mbox = {\r
++    .new_sprinter = sprinter_text_create,\r
+     .part = format_part_mbox,\r
+ };\r
+ \r
+@@ -55,6 +59,7 @@ format_part_raw (unused (const void *ctx), mime_node_t *node,\r
+                unused (const notmuch_show_params_t *params));\r
+ \r
+ static const notmuch_show_format_t format_raw = {\r
++    .new_sprinter = sprinter_text_create,\r
+     .part = format_part_raw,\r
+ };\r
+ \r
+@@ -1003,6 +1008,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+     char *query_string;\r
+     int opt_index, ret;\r
+     const notmuch_show_format_t *format = &format_text;\r
++    sprinter_t *sprinter;\r
+     notmuch_show_params_t params = {\r
+       .part = -1,\r
+       .omit_excluded = TRUE,\r
+@@ -1130,6 +1136,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+       return 1;\r
+     }\r
+ \r
++    /* Create structure printer. */\r
++    sprinter = format->new_sprinter(ctx, stdout);\r
++\r
+     /* If a single message is requested we do not use search_excludes. */\r
+     if (params.part >= 0)\r
+       ret = do_show_single (ctx, query, format, &params);\r
+-- \r
+1.7.10\r
+\r