55/e8f2dc1c3c6aaacc554a0428dbbcc7d8c9df75

   1 Return-Path: <amthrax@drake.mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 98A70429E25\r
   6         for <notmuch@notmuchmail.org>; Wed, 11 Jan 2012 17:49:47 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id c1ldN0hxlG3j for <notmuch@notmuchmail.org>;\r
  16         Wed, 11 Jan 2012 17:49:46 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
  18         [18.7.68.34])\r
  19         by olra.theworths.org (Postfix) with ESMTP id B6942429E21\r
  20         for <notmuch@notmuchmail.org>; Wed, 11 Jan 2012 17:49:46 -0800 (PST)\r
  21 X-AuditID: 12074422-b7fd66d0000008f9-aa-4f0e3c398863\r
  22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
  23         by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id C8.2B.02297.93C3E0F4; Wed, 11 Jan 2012 20:49:45 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q0C1njXD005936; \r
  27         Wed, 11 Jan 2012 20:49:45 -0500\r
  28 Received: from drake.mit.edu\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q0C1nhHg001518\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Wed, 11 Jan 2012 20:49:45 -0500 (EST)\r
  35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  36         (envelope-from <amthrax@drake.mit.edu>)\r
  37         id 1Rl9nS-000806-A9; Wed, 11 Jan 2012 20:49:42 -0500\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [RFC PATCH 2/5] show: Introduce mime_node formatter callback\r
  41 Date: Wed, 11 Jan 2012 20:49:30 -0500\r
  42 Message-Id: <1326332973-30225-3-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.7.3\r
  44 In-Reply-To: <1326332973-30225-1-git-send-email-amdragon@mit.edu>\r
  45 References: <1326332973-30225-1-git-send-email-amdragon@mit.edu>\r
  46 X-Brightmail-Tracker:\r
  47  H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixCmqrWtpw+dv8Oq1vMX1mzOZHRg9nq26\r
  48         xRzAGMVlk5Kak1mWWqRvl8CVcXzTL/aCVsmKC3PPMTYwbhHuYuTgkBAwkbj7VK2LkRPIFJO4\r
  49         cG89WxcjF4eQwD5GiTWfljFBOBsYJY52LGeBcO4zSWya9pAVwpnPKHHyJYjDycEmoCGxbf9y\r
  50         RhBbREBaYufd2awgK5gFRCTezWQCCQsLuEpc2byfDcRmEVCVmPtlMlicV8BBYs7jfSwQZyhI\r
  51         nFt9jh3E5hRwlOg/fgysXgio5sXOp8wTGPkXMDKsYpRNya3SzU3MzClOTdYtTk7My0st0jXV\r
  52         y80s0UtNKd3ECAoadhelHYw/DyodYhTgYFTi4d2xl9dfiDWxrLgy9xCjJAeTkijvdys+fyG+\r
  53         pPyUyozE4oz4otKc1OJDjBIczEoivE41QOW8KYmVValF+TApaQ4WJXFeda13fkIC6Yklqdmp\r
  54         qQWpRTBZGQ4OJQneEmugoYJFqempFWmZOSUIaSYOTpDhPEDDM0BqeIsLEnOLM9Mh8qcYFaXE\r
  55         ed1BEgIgiYzSPLheWFS/YhQHekWYNx+kigeYEOC6XwENZgIavGUdD8jgkkSElFQD44x7kb/X\r
  56         u7ge/fDT8maolefzzIhSkaPCBm7c4Sr3Hisc1nVoZLzZYrZMY1npfPm255ZpfH+cfx2RNaxQ\r
  57         Ti95HPF05081NuYth556f44rDm13WqW1yzbkdp+I0ZTMXxdnp3SaMdx4eFtD2fXY0vdS4WX1\r
  58         r6bM40m6EehVJ+DcZG1XM98gdesqJZbijERDLeai4kQA+iiai8UCAAA=\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Thu, 12 Jan 2012 01:49:47 -0000\r
  72 \r
  73 This callback is the gateway to the new mime_node_t-based formatters.\r
  74 This maintains backwards compatibility so the formatters can be\r
  75 transitioned one at a time.  Once this is done, the formatter\r
  76 structure can be safely gutted.\r
  77 ---\r
  78  notmuch-client.h |    6 ++++++\r
  79  notmuch-reply.c  |    2 +-\r
  80  notmuch-show.c   |   22 ++++++++++++++++++----\r
  81  3 files changed, 25 insertions(+), 5 deletions(-)\r
  82 \r
  83 diff --git a/notmuch-client.h b/notmuch-client.h\r
  84 index 8832242..52448ef 100644\r
  85 --- a/notmuch-client.h\r
  86 +++ b/notmuch-client.h\r
  87 @@ -54,8 +54,14 @@\r
  88  #define STRINGIFY(s) STRINGIFY_(s)\r
  89  #define STRINGIFY_(s) #s\r
  90  \r
  91 +struct mime_node;\r
  92 +struct notmuch_show_params;\r
  93 +\r
  94  typedef struct notmuch_show_format {\r
  95      const char *message_set_start;\r
  96 +    void (*part) (const void *ctx,\r
  97 +                 struct mime_node *node, int indent,\r
  98 +                 struct notmuch_show_params *params);\r
  99      const char *message_start;\r
 100      void (*message) (const void *ctx,\r
 101                      notmuch_message_t *message,\r
 102 diff --git a/notmuch-reply.c b/notmuch-reply.c\r
 103 index 000f6da..33c4ee8 100644\r
 104 --- a/notmuch-reply.c\r
 105 +++ b/notmuch-reply.c\r
 106 @@ -31,7 +31,7 @@ static void\r
 107  reply_part_content (GMimeObject *part);\r
 108  \r
 109  static const notmuch_show_format_t format_reply = {\r
 110 -    "",\r
 111 +    "", NULL,\r
 112         "", NULL,\r
 113             "", NULL, reply_headers_message_part, ">\n",\r
 114             "",\r
 115 diff --git a/notmuch-show.c b/notmuch-show.c\r
 116 index 0200b9c..45c3569 100644\r
 117 --- a/notmuch-show.c\r
 118 +++ b/notmuch-show.c\r
 119 @@ -42,7 +42,7 @@ static void\r
 120  format_part_end_text (GMimeObject *part);\r
 121  \r
 122  static const notmuch_show_format_t format_text = {\r
 123 -    "",\r
 124 +    "", NULL,\r
 125         "\fmessage{ ", format_message_text,\r
 126             "\fheader{\n", format_headers_text, format_headers_message_part_text, "\fheader}\n",\r
 127             "\fbody{\n",\r
 128 @@ -85,7 +85,7 @@ static void\r
 129  format_part_end_json (GMimeObject *part);\r
 130  \r
 131  static const notmuch_show_format_t format_json = {\r
 132 -    "[",\r
 133 +    "[", NULL,\r
 134         "{", format_message_json,\r
 135             "\"headers\": {", format_headers_json, format_headers_message_part_json, "}",\r
 136             ", \"body\": [",\r
 137 @@ -106,7 +106,7 @@ format_message_mbox (const void *ctx,\r
 138                      unused (int indent));\r
 139  \r
 140  static const notmuch_show_format_t format_mbox = {\r
 141 -    "",\r
 142 +    "", NULL,\r
 143          "", format_message_mbox,\r
 144              "", NULL, NULL, "",\r
 145              "",\r
 146 @@ -125,7 +125,7 @@ static void\r
 147  format_part_content_raw (GMimeObject *part);\r
 148  \r
 149  static const notmuch_show_format_t format_raw = {\r
 150 -    "",\r
 151 +    "", NULL,\r
 152         "", NULL,\r
 153             "", NULL, format_headers_message_part_text, "\n",\r
 154              "",\r
 155 @@ -744,6 +744,20 @@ show_message (void *ctx,\r
 156               int indent,\r
 157               notmuch_show_params_t *params)\r
 158  {\r
 159 +    if (format->part) {\r
 160 +       void *local = talloc_new (ctx);\r
 161 +       mime_node_t *root, *part;\r
 162 +\r
 163 +       if (mime_node_open (local, message, params->cryptoctx, params->decrypt,\r
 164 +                           &root) != NOTMUCH_STATUS_SUCCESS)\r
 165 +           return;\r
 166 +       part = mime_node_seek_dfs (root, params->part < 0 ? 0 : params->part);\r
 167 +       if (part)\r
 168 +           format->part (local, part, indent, params);\r
 169 +       talloc_free (local);\r
 170 +       return;\r
 171 +    }\r
 172 +\r
 173      if (params->part <= 0) {\r
 174         fputs (format->message_start, stdout);\r
 175         if (format->message)\r
 176 -- \r
 177 1.7.7.3\r
 178 \r