--- /dev/null
+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 ED0D6431FB6\r
+ for <notmuch@notmuchmail.org>; Tue, 4 Dec 2012 11:22:50 -0800 (PST)\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 JuhNdl0LzDd2 for <notmuch@notmuchmail.org>;\r
+ Tue, 4 Dec 2012 11:22:47 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
+ [18.9.25.13])\r
+ by olra.theworths.org (Postfix) with ESMTP id 07A67431FAE\r
+ for <notmuch@notmuchmail.org>; Tue, 4 Dec 2012 11:22:46 -0800 (PST)\r
+X-AuditID: 1209190d-b7f266d00000092b-d5-50be4d85bb38\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 5F.E9.02347.58D4EB05; Tue, 4 Dec 2012 14:22:45 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id qB4JMjsI026875; \r
+ Tue, 4 Dec 2012 14:22:45 -0500\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+ (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 qB4JMi8s009547\r
+ (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);\r
+ Tue, 4 Dec 2012 14:22:45 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1Tfy4p-0001nP-Qt; Tue, 04 Dec 2012 14:22:43 -0500\r
+From: Austin Clements <aclements@csail.mit.edu>\r
+To: Peter Feigl <craven@gmx.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2 3/5] Use the S-Expression structured printer in\r
+ notmuch-show, notmuch-reply and notmuch-search.\r
+In-Reply-To: <1354632382-15609-4-git-send-email-craven@gmx.net>\r
+References: <1354632382-15609-1-git-send-email-craven@gmx.net>\r
+ <1354632382-15609-4-git-send-email-craven@gmx.net>\r
+User-Agent: Notmuch/0.14+100~gcb9b0b0 (http://notmuchmail.org) Emacs/23.4.1\r
+ (i486-pc-linux-gnu)\r
+Date: Tue, 04 Dec 2012 14:22:43 -0500\r
+Message-ID: <87d2ypy64c.fsf@awakening.csail.mit.edu>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFrrPIsWRmVeSWpSXmKPExsUixCmqrdvquy/A4EaLnsXehnZGi+s3ZzI7\r
+ MHks3rSfzePZqlvMAUxRXDYpqTmZZalF+nYJXBk3191kLlhgULG18yJrA+NF1S5GTg4JAROJ\r
+ x5feMUPYYhIX7q1nA7GFBPYxSux9ltDFyAVkr2eU+LJ8ISOEc4FJ4vTBqywQzhJGiY+TvrGD\r
+ tLAJ6EusWDuJFcQWEbCUmPrlEtgoYYEyiaaHvUBxDg5OAXuJ9y36EBsKJa6sOcQIEhYViJe4\r
+ vFQBJMwioCqxc9IhsIN4gY6bsauLBcIWlDg58wmYzSygJXHj30umCYwCs5CkZiFJLWBkWsUo\r
+ m5JbpZubmJlTnJqsW5ycmJeXWqRrpJebWaKXmlK6iREcjpK8OxjfHVQ6xCjAwajEwytpvC9A\r
+ iDWxrLgy9xCjJAeTkijvP0+gEF9SfkplRmJxRnxRaU5q8SFGCQ5mJRHef3ZAOd6UxMqq1KJ8\r
+ mJQ0B4uSOO+VlJv+QgLpiSWp2ampBalFMFkZDg4lCd6LPkCNgkWp6akVaZk5JQhpJg5OkOE8\r
+ QMPngtTwFhck5hZnpkPkTzEqSonzfgZJCIAkMkrz4Hph6eIVozjQK8K8/0CqeICpBq77FdBg\r
+ JqDBL4R2gwwuSURISTUwlnVzPrXJZPdlWPNXJTja8EtuQezJc3ZZm23qLy9oCX1RMz8v4J9d\r
+ qLxzS8Il73juNf4X/tzsvbdgr6iK1f5vqfM0XJ4kO5jOL9lyYqnbp9euftongtnWMudaZEw9\r
+ 9Wyfp+l1rZlVuRcWpEtmvv3ecz1l6WO5z0efa7prCIXucd6Z95TBUaFDiaU4I9FQi7moOBEA\r
+ 1rGbRPICAAA=\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, 04 Dec 2012 19:22:51 -0000\r
+\r
+On Tue, 04 Dec 2012, Peter Feigl <craven@gmx.net> wrote:\r
+> This patch uses the new S-Expression printer in the notmuch CLI (show,\r
+> search and reply). You can now use --format=sexp for any of them.\r
+> ---\r
+> notmuch-reply.c | 5 +++++\r
+> notmuch-search.c | 6 +++++-\r
+> notmuch-show.c | 18 ++++++++++++++----\r
+> 3 files changed, 24 insertions(+), 5 deletions(-)\r
+>\r
+> diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+> index 53aefa7..69fd256 100644\r
+> --- a/notmuch-reply.c\r
+> +++ b/notmuch-reply.c\r
+> @@ -697,6 +697,7 @@ notmuch_reply_format_headers_only(void *ctx,\r
+> enum {\r
+> FORMAT_DEFAULT,\r
+> FORMAT_JSON,\r
+> + FORMAT_SEXP,\r
+> FORMAT_HEADERS_ONLY,\r
+> };\r
+> \r
+> @@ -724,6 +725,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])\r
+> { NOTMUCH_OPT_KEYWORD, &format, "format", 'f',\r
+> (notmuch_keyword_t []){ { "default", FORMAT_DEFAULT },\r
+> { "json", FORMAT_JSON },\r
+> + { "sexp", FORMAT_SEXP },\r
+\r
+"sexpa" if we're going to support both alists and plists? Same for the\r
+others.\r
+\r
+> { "headers-only", FORMAT_HEADERS_ONLY },\r
+> { 0, 0 } } },\r
+> { NOTMUCH_OPT_KEYWORD, &reply_all, "reply-to", 'r',\r
+> @@ -745,6 +747,9 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])\r
+> } else if (format == FORMAT_JSON) {\r
+> reply_format_func = notmuch_reply_format_sprinter;\r
+> sp = sprinter_json_create (ctx, stdout);\r
+> + } else if (format == FORMAT_SEXP) {\r
+> + reply_format_func = notmuch_reply_format_sprinter;\r
+> + sp = sprinter_sexp_create (ctx, stdout);\r
+> } else {\r
+> reply_format_func = notmuch_reply_format_default;\r
+> }\r
+> diff --git a/notmuch-search.c b/notmuch-search.c\r
+> index 830c4e4..6218622 100644\r
+> --- a/notmuch-search.c\r
+> +++ b/notmuch-search.c\r
+> @@ -305,7 +305,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+> int exclude = EXCLUDE_TRUE;\r
+> unsigned int i;\r
+> \r
+> - enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT }\r
+> + enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT, NOTMUCH_FORMAT_SEXP }\r
+> format_sel = NOTMUCH_FORMAT_TEXT;\r
+> \r
+> notmuch_opt_desc_t options[] = {\r
+> @@ -315,6 +315,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+> { 0, 0 } } },\r
+> { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f',\r
+> (notmuch_keyword_t []){ { "json", NOTMUCH_FORMAT_JSON },\r
+> + { "sexp", NOTMUCH_FORMAT_SEXP },\r
+> { "text", NOTMUCH_FORMAT_TEXT },\r
+> { 0, 0 } } },\r
+> { NOTMUCH_OPT_KEYWORD, &output, "output", 'o',\r
+> @@ -347,6 +348,9 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+> case NOTMUCH_FORMAT_JSON:\r
+> format = sprinter_json_create (ctx, stdout);\r
+> break;\r
+> + case NOTMUCH_FORMAT_SEXP:\r
+> + format = sprinter_sexp_create (ctx, stdout);\r
+> + break;\r
+> default:\r
+> /* this should never happen */\r
+> INTERNAL_ERROR("no output format selected");\r
+> diff --git a/notmuch-show.c b/notmuch-show.c\r
+> index 38c621f..d4860f1 100644\r
+> --- a/notmuch-show.c\r
+> +++ b/notmuch-show.c\r
+> @@ -40,6 +40,11 @@ static const notmuch_show_format_t format_json = {\r
+> .part = format_part_sprinter_entry,\r
+> };\r
+> \r
+> +static const notmuch_show_format_t format_sexp = {\r
+> + .new_sprinter = sprinter_sexp_create,\r
+> + .part = format_part_sprinter_entry,\r
+> +};\r
+> +\r
+> static notmuch_status_t\r
+> format_part_mbox (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+> int indent, const notmuch_show_params_t *params);\r
+> @@ -110,7 +115,7 @@ _get_one_line_summary (const void *ctx, notmuch_message_t *message)\r
+> static void\r
+> format_message_sprinter (sprinter_t *sp, notmuch_message_t *message)\r
+> {\r
+> - /* Any changes to the JSON format should be reflected in the file\r
+> + /* Any changes to the JSON or S-Expression format should be reflected in the file\r
+> * devel/schemata. */\r
+\r
+Please re-wrap this comment to 72 columns.\r
+\r
+> \r
+> void *local = talloc_new (NULL);\r
+> @@ -1012,6 +1017,7 @@ do_show (void *ctx,\r
+> enum {\r
+> NOTMUCH_FORMAT_NOT_SPECIFIED,\r
+> NOTMUCH_FORMAT_JSON,\r
+> + NOTMUCH_FORMAT_SEXP,\r
+> NOTMUCH_FORMAT_TEXT,\r
+> NOTMUCH_FORMAT_MBOX,\r
+> NOTMUCH_FORMAT_RAW\r
+> @@ -1056,6 +1062,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+> { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f',\r
+> (notmuch_keyword_t []){ { "json", NOTMUCH_FORMAT_JSON },\r
+> { "text", NOTMUCH_FORMAT_TEXT },\r
+> + { "sexp", NOTMUCH_FORMAT_SEXP },\r
+> { "mbox", NOTMUCH_FORMAT_MBOX },\r
+> { "raw", NOTMUCH_FORMAT_RAW },\r
+> { 0, 0 } } },\r
+> @@ -1100,6 +1107,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+> case NOTMUCH_FORMAT_TEXT:\r
+> format = &format_text;\r
+> break;\r
+> + case NOTMUCH_FORMAT_SEXP:\r
+> + format = &format_sexp;\r
+> + break;\r
+> case NOTMUCH_FORMAT_MBOX:\r
+> if (params.part > 0) {\r
+> fprintf (stderr, "Error: specifying parts is incompatible with mbox output format.\n");\r
+> @@ -1120,7 +1130,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+> \r
+> /* Default is entire-thread = FALSE except for format=json. */\r
+> if (entire_thread == ENTIRE_THREAD_DEFAULT) {\r
+> - if (format == &format_json)\r
+> + if (format == &format_json || format == &format_sexp)\r
+\r
+Good catch.\r
+\r
+> entire_thread = ENTIRE_THREAD_TRUE;\r
+> else\r
+> entire_thread = ENTIRE_THREAD_FALSE;\r
+> @@ -1131,8 +1141,8 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+> fprintf (stderr, "Warning: --body=false is incompatible with --part > 0. Disabling.\n");\r
+> params.output_body = TRUE;\r
+> } else {\r
+> - if (format != &format_json)\r
+> - fprintf (stderr, "Warning: --body=false only implemented for format=json\n");\r
+> + if (format != &format_json && format != &format_sexp)\r
+> + fprintf (stderr, "Warning: --body=false only implemented for format=json and format=sexp\n");\r
+> }\r
+> }\r
+> \r
+> -- \r
+> 1.8.0\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff