--- /dev/null
+Return-Path: <nex@nexoid.at>\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 12ED4429E3B\r
+ for <notmuch@notmuchmail.org>; Tue, 4 Dec 2012 06:46:44 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.001\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.001 tagged_above=-999 required=5\r
+ tests=[FREEMAIL_FROM=0.001] 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 owKnj6iMzzfV for <notmuch@notmuchmail.org>;\r
+ Tue, 4 Dec 2012 06:46:42 -0800 (PST)\r
+Received: from mail.nexoid.at (www.nexoid.at [178.79.130.240])\r
+ (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 3C2FD431FD7\r
+ for <notmuch@notmuchmail.org>; Tue, 4 Dec 2012 06:46:41 -0800 (PST)\r
+Received: by mail.nexoid.at (Postfix, from userid 1000)\r
+ id 41F7B11C109; Tue, 4 Dec 2012 15:46:40 +0100 (CET)\r
+From: Peter Feigl <craven@gmx.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 3/5] Use the S-Expression structured printer in\r
+ notmuch-show, notmuch-reply and notmuch-search.\r
+Date: Tue, 4 Dec 2012 15:46:20 +0100\r
+Message-Id: <1354632382-15609-4-git-send-email-craven@gmx.net>\r
+X-Mailer: git-send-email 1.8.0\r
+In-Reply-To: <1354632382-15609-1-git-send-email-craven@gmx.net>\r
+References: <1354632382-15609-1-git-send-email-craven@gmx.net>\r
+In-Reply-To: <1354264143-30173-1-git-send-email-craven@gmx.net>\r
+References: <1354264143-30173-1-git-send-email-craven@gmx.net>\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 14:46:44 -0000\r
+\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
+ { "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
+ 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
+ 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
projects / notmuch-archives.git / commitdiff