--- /dev/null
+Return-Path: <craven@gmx.net>\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 5573F429E50\r
+ for <notmuch@notmuchmail.org>; Thu, 12 Jul 2012 00:42:17 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\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, RCVD_IN_DNSWL_NONE=-0.0001]\r
+ 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 328ZKQq0txIH for <notmuch@notmuchmail.org>;\r
+ Thu, 12 Jul 2012 00:42:11 -0700 (PDT)\r
+Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.22])\r
+ by olra.theworths.org (Postfix) with SMTP id 7EFE6431FAE\r
+ for <notmuch@notmuchmail.org>; Thu, 12 Jul 2012 00:42:10 -0700 (PDT)\r
+Received: (qmail invoked by alias); 12 Jul 2012 07:42:02 -0000\r
+Received: from gw.arelion.cust.net.lagis.at (EHLO dodekanex.arelion.at)\r
+ [83.164.197.182]\r
+ by mail.gmx.net (mp027) with SMTP; 12 Jul 2012 09:42:02 +0200\r
+X-Authenticated: #201305\r
+X-Provags-ID: V01U2FsdGVkX19uyYcosdlugZbxWUIO4vqOl3GmgQ8WephdZfN7M7\r
+ 4ENuSjvnTyIjUi\r
+Received: by dodekanex.arelion.at (Postfix, from userid 1000)\r
+ id BE4F13011C3; Thu, 12 Jul 2012 09:43:31 +0200 (CEST)\r
+From: <craven@gmx.net>\r
+To: notmuch@notmuchmail.org\r
+Subject:\r
+ [PATCH v4 3/3] Use the structured format printer for JSON in notmuch search.\r
+Date: Thu, 12 Jul 2012 09:43:24 +0200\r
+Message-Id: <1342079004-5300-4-git-send-email-craven@gmx.net>\r
+X-Mailer: git-send-email 1.7.11.1\r
+In-Reply-To: <1342079004-5300-1-git-send-email-craven@gmx.net>\r
+References: <87d34hsdx8.fsf@awakening.csail.mit.edu>\r
+ <1342079004-5300-1-git-send-email-craven@gmx.net>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: 8bit\r
+X-Y-GMX-Trusted: 0\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: Thu, 12 Jul 2012 07:42:17 -0000\r
+\r
+This patch switches from the current ad-hoc printer to the structured\r
+output formatter in sprinter.h.\r
+\r
+It removes search_format_t, replaces it by sprinter_t and inlines the\r
+text printer where necessary.\r
+\r
+The tests are changed (only whitespaces and regular expressions) in\r
+order to make them PASS for the new structured output formatter.\r
+---\r
+ notmuch-search.c | 349 ++++++++++++++++++++++-------------------------------\r
+ test/json | 20 +--\r
+ test/search-output | 270 +++++++++++++++++++++--------------------\r
+ 3 files changed, 288 insertions(+), 351 deletions(-)\r
+\r
+diff --git a/notmuch-search.c b/notmuch-search.c\r
+index 3be296d..b853f5f 100644\r
+--- a/notmuch-search.c\r
++++ b/notmuch-search.c\r
+@@ -19,6 +19,7 @@\r
+ */\r
+ \r
+ #include "notmuch-client.h"\r
++#include "sprinter.h"\r
+ \r
+ typedef enum {\r
+ OUTPUT_SUMMARY,\r
+@@ -28,91 +29,9 @@ typedef enum {\r
+ OUTPUT_TAGS\r
+ } output_t;\r
+ \r
+-typedef struct search_format {\r
+- const char *results_start;\r
+- const char *item_start;\r
+- void (*item_id) (const void *ctx,\r
+- const char *item_type,\r
+- const char *item_id);\r
+- void (*thread_summary) (const void *ctx,\r
+- const char *thread_id,\r
+- const time_t date,\r
+- const int matched,\r
+- const int total,\r
+- const char *authors,\r
+- const char *subject);\r
+- const char *tag_start;\r
+- const char *tag;\r
+- const char *tag_sep;\r
+- const char *tag_end;\r
+- const char *item_sep;\r
+- const char *item_end;\r
+- const char *results_end;\r
+- const char *results_null;\r
+-} search_format_t;\r
+-\r
+-static void\r
+-format_item_id_text (const void *ctx,\r
+- const char *item_type,\r
+- const char *item_id);\r
+-\r
+-static void\r
+-format_thread_text (const void *ctx,\r
+- const char *thread_id,\r
+- const time_t date,\r
+- const int matched,\r
+- const int total,\r
+- const char *authors,\r
+- const char *subject);\r
+-static const search_format_t format_text = {\r
+- "",\r
+- "",\r
+- format_item_id_text,\r
+- format_thread_text,\r
+- " (",\r
+- "%s", " ",\r
+- ")", "\n",\r
+- "",\r
+- "\n",\r
+- "",\r
+-};\r
+-\r
+-static void\r
+-format_item_id_json (const void *ctx,\r
+- const char *item_type,\r
+- const char *item_id);\r
+-\r
+-static void\r
+-format_thread_json (const void *ctx,\r
+- const char *thread_id,\r
+- const time_t date,\r
+- const int matched,\r
+- const int total,\r
+- const char *authors,\r
+- const char *subject);\r
+-\r
+-/* Any changes to the JSON format should be reflected in the file\r
+- * devel/schemata. */\r
+-static const search_format_t format_json = {\r
+- "[",\r
+- "{",\r
+- format_item_id_json,\r
+- format_thread_json,\r
+- "\"tags\": [",\r
+- "\"%s\"", ", ",\r
+- "]", ",\n",\r
+- "}",\r
+- "]\n",\r
+- "]\n",\r
+-};\r
+-\r
+-static void\r
+-format_item_id_text (unused (const void *ctx),\r
+- const char *item_type,\r
+- const char *item_id)\r
+-{\r
+- printf ("%s%s", item_type, item_id);\r
+-}\r
++static const char * text_item_sep = "\n";\r
++static const char * text_results_null = "";\r
++static const char * text_results_end = "\n";\r
+ \r
+ static char *\r
+ sanitize_string (const void *ctx, const char *str)\r
+@@ -131,72 +50,8 @@ sanitize_string (const void *ctx, const char *str)\r
+ return out;\r
+ }\r
+ \r
+-static void\r
+-format_thread_text (const void *ctx,\r
+- const char *thread_id,\r
+- const time_t date,\r
+- const int matched,\r
+- const int total,\r
+- const char *authors,\r
+- const char *subject)\r
+-{\r
+- void *ctx_quote = talloc_new (ctx);\r
+-\r
+- printf ("thread:%s %12s [%d/%d] %s; %s",\r
+- thread_id,\r
+- notmuch_time_relative_date (ctx, date),\r
+- matched,\r
+- total,\r
+- sanitize_string (ctx_quote, authors),\r
+- sanitize_string (ctx_quote, subject));\r
+-\r
+- talloc_free (ctx_quote);\r
+-}\r
+-\r
+-static void\r
+-format_item_id_json (const void *ctx,\r
+- unused (const char *item_type),\r
+- const char *item_id)\r
+-{\r
+- void *ctx_quote = talloc_new (ctx);\r
+-\r
+- printf ("%s", json_quote_str (ctx_quote, item_id));\r
+-\r
+- talloc_free (ctx_quote);\r
+- \r
+-}\r
+-\r
+-static void\r
+-format_thread_json (const void *ctx,\r
+- const char *thread_id,\r
+- const time_t date,\r
+- const int matched,\r
+- const int total,\r
+- const char *authors,\r
+- const char *subject)\r
+-{\r
+- void *ctx_quote = talloc_new (ctx);\r
+-\r
+- printf ("\"thread\": %s,\n"\r
+- "\"timestamp\": %ld,\n"\r
+- "\"date_relative\": \"%s\",\n"\r
+- "\"matched\": %d,\n"\r
+- "\"total\": %d,\n"\r
+- "\"authors\": %s,\n"\r
+- "\"subject\": %s,\n",\r
+- json_quote_str (ctx_quote, thread_id),\r
+- date,\r
+- notmuch_time_relative_date (ctx, date),\r
+- matched,\r
+- total,\r
+- json_quote_str (ctx_quote, authors),\r
+- json_quote_str (ctx_quote, subject));\r
+-\r
+- talloc_free (ctx_quote);\r
+-}\r
+-\r
+ static int\r
+-do_search_threads (const search_format_t *format,\r
++do_search_threads (sprinter_t *format,\r
+ notmuch_query_t *query,\r
+ notmuch_sort_t sort,\r
+ output_t output,\r
+@@ -220,7 +75,9 @@ do_search_threads (const search_format_t *format,\r
+ if (threads == NULL)\r
+ return 1;\r
+ \r
+- fputs (format->results_start, stdout);\r
++ if (format != sprinter_text) {\r
++ format->begin_list (format);\r
++ }\r
+ \r
+ for (i = 0;\r
+ notmuch_threads_valid (threads) && (limit < 0 || i < offset + limit);\r
+@@ -235,43 +92,96 @@ do_search_threads (const search_format_t *format,\r
+ continue;\r
+ }\r
+ \r
+- if (! first_thread)\r
+- fputs (format->item_sep, stdout);\r
++ if (format == sprinter_text && ! first_thread)\r
++ fputs (text_item_sep, stdout);\r
+ \r
+ if (output == OUTPUT_THREADS) {\r
+- format->item_id (thread, "thread:",\r
+- notmuch_thread_get_thread_id (thread));\r
++ const char *thread_id = notmuch_thread_get_thread_id (thread);\r
++ if (format == sprinter_text)\r
++ printf ("thread:%s", thread_id);\r
++ else {\r
++ format->string (format, thread_id);\r
++ format->frame (format);\r
++ }\r
++\r
+ } else { /* output == OUTPUT_SUMMARY */\r
+- fputs (format->item_start, stdout);\r
++ const char *authors = notmuch_thread_get_authors (thread);\r
++ const char *subject = notmuch_thread_get_subject (thread);\r
++ const char *thread_id = notmuch_thread_get_thread_id (thread);\r
++ int matched = notmuch_thread_get_matched_messages (thread);\r
++ int total = notmuch_thread_get_total_messages (thread);\r
++ const char *relative_date = NULL;\r
++\r
++ if (format != sprinter_text)\r
++ format->begin_map (format);\r
++\r
+ \r
+ if (sort == NOTMUCH_SORT_OLDEST_FIRST)\r
+ date = notmuch_thread_get_oldest_date (thread);\r
+ else\r
+ date = notmuch_thread_get_newest_date (thread);\r
+ \r
+- format->thread_summary (thread,\r
+- notmuch_thread_get_thread_id (thread),\r
+- date,\r
+- notmuch_thread_get_matched_messages (thread),\r
+- notmuch_thread_get_total_messages (thread),\r
+- notmuch_thread_get_authors (thread),\r
+- notmuch_thread_get_subject (thread));\r
++ void *ctx_quote = talloc_new (thread);\r
++ relative_date =\r
++ notmuch_time_relative_date (ctx_quote, date);\r
++\r
++ if (format == sprinter_text) {\r
++ printf ("thread:%s %12s [%d/%d] %s; %s",\r
++ thread_id,\r
++ relative_date,\r
++ matched,\r
++ total,\r
++ sanitize_string (ctx_quote, authors),\r
++ sanitize_string (ctx_quote, subject));\r
++ } else {\r
++ format->map_key (format, "thread");\r
++ format->string (format, thread_id);\r
++ format->map_key (format, "timestamp");\r
++ format->integer (format, date);\r
++ format->map_key (format, "date_relative");\r
++ format->string (format, relative_date);\r
++ format->map_key (format, "matched");\r
++ format->integer (format, matched);\r
++ format->map_key (format, "total");\r
++ format->integer (format, total);\r
++ format->map_key (format, "authors");\r
++ format->string (format, authors);\r
++ format->map_key (format, "subject");\r
++ format->string (format, subject);\r
++ }\r
++\r
++ talloc_free (ctx_quote);\r
+ \r
+- fputs (format->tag_start, stdout);\r
++ if (format == sprinter_text) {\r
++ fputs (" (", stdout);\r
++ } else {\r
++ format->map_key (format, "tags");\r
++ format->begin_list (format);\r
++ }\r
+ \r
+ for (tags = notmuch_thread_get_tags (thread);\r
+ notmuch_tags_valid (tags);\r
+ notmuch_tags_move_to_next (tags))\r
+ {\r
+- if (! first_tag)\r
+- fputs (format->tag_sep, stdout);\r
+- printf (format->tag, notmuch_tags_get (tags));\r
++ const char *tag = notmuch_tags_get (tags);\r
++ if (format == sprinter_text) {\r
++ if (! first_tag)\r
++ fputs (" ", stdout);\r
++ fputs (tag, stdout);\r
++ } else {\r
++ format->string (format, tag);\r
++ }\r
++\r
+ first_tag = 0;\r
+ }\r
+ \r
+- fputs (format->tag_end, stdout);\r
+-\r
+- fputs (format->item_end, stdout);\r
++ if (format == sprinter_text) {\r
++ fputs (")", stdout);\r
++ } else {\r
++ format->end (format);\r
++ format->end (format);\r
++ format->frame (format);\r
++ }\r
+ }\r
+ \r
+ first_thread = 0;\r
+@@ -279,16 +189,20 @@ do_search_threads (const search_format_t *format,\r
+ notmuch_thread_destroy (thread);\r
+ }\r
+ \r
+- if (first_thread)\r
+- fputs (format->results_null, stdout);\r
+- else\r
+- fputs (format->results_end, stdout);\r
++ if (format == sprinter_text)\r
++ if (first_thread)\r
++ fputs (text_results_null, stdout);\r
++ else\r
++ fputs (text_results_end, stdout);\r
++ else {\r
++ format->end (format);\r
++ }\r
+ \r
+ return 0;\r
+ }\r
+ \r
+ static int\r
+-do_search_messages (const search_format_t *format,\r
++do_search_messages (sprinter_t *format,\r
+ notmuch_query_t *query,\r
+ output_t output,\r
+ int offset,\r
+@@ -310,7 +224,8 @@ do_search_messages (const search_format_t *format,\r
+ if (messages == NULL)\r
+ return 1;\r
+ \r
+- fputs (format->results_start, stdout);\r
++ if (format != sprinter_text)\r
++ format->begin_list (format);\r
+ \r
+ for (i = 0;\r
+ notmuch_messages_valid (messages) && (limit < 0 || i < offset + limit);\r
+@@ -328,23 +243,36 @@ do_search_messages (const search_format_t *format,\r
+ notmuch_filenames_valid (filenames);\r
+ notmuch_filenames_move_to_next (filenames))\r
+ {\r
+- if (! first_message)\r
+- fputs (format->item_sep, stdout);\r
++ const char *filenames_str = notmuch_filenames_get (filenames);\r
++\r
++ if (format == sprinter_text && ! first_message)\r
++ fputs (text_item_sep, stdout);\r
+ \r
+- format->item_id (message, "",\r
+- notmuch_filenames_get (filenames));\r
++ if (format == sprinter_text)\r
++ fputs (filenames_str, stdout);\r
++ else {\r
++ format->string (format, filenames_str);\r
++ format->frame (format);\r
++ }\r
+ \r
+ first_message = 0;\r
+ }\r
+- \r
+- notmuch_filenames_destroy( filenames );\r
++\r
++ notmuch_filenames_destroy (filenames);\r
+ \r
+ } else { /* output == OUTPUT_MESSAGES */\r
+- if (! first_message)\r
+- fputs (format->item_sep, stdout);\r
++ const char *message_id = notmuch_message_get_message_id (message);\r
++\r
++ if (format == sprinter_text && ! first_message)\r
++ fputs (text_item_sep, stdout);\r
++\r
++ if (format == sprinter_text)\r
++ printf ("id:%s", message_id);\r
++ else {\r
++ format->string (format, message_id);\r
++ format->frame (format);\r
++ }\r
+ \r
+- format->item_id (message, "id:",\r
+- notmuch_message_get_message_id (message));\r
+ first_message = 0;\r
+ }\r
+ \r
+@@ -353,17 +281,21 @@ do_search_messages (const search_format_t *format,\r
+ \r
+ notmuch_messages_destroy (messages);\r
+ \r
+- if (first_message)\r
+- fputs (format->results_null, stdout);\r
+- else\r
+- fputs (format->results_end, stdout);\r
++ if (format == sprinter_text)\r
++ if (first_message)\r
++ fputs (text_results_null, stdout);\r
++ else\r
++ fputs (text_results_end, stdout);\r
++ else {\r
++ format->end (format);\r
++ }\r
+ \r
+ return 0;\r
+ }\r
+ \r
+ static int\r
+ do_search_tags (notmuch_database_t *notmuch,\r
+- const search_format_t *format,\r
++ sprinter_t *format,\r
+ notmuch_query_t *query)\r
+ {\r
+ notmuch_messages_t *messages = NULL;\r
+@@ -387,7 +319,8 @@ do_search_tags (notmuch_database_t *notmuch,\r
+ if (tags == NULL)\r
+ return 1;\r
+ \r
+- fputs (format->results_start, stdout);\r
++ if (format != sprinter_text)\r
++ format->begin_list (format);\r
+ \r
+ for (;\r
+ notmuch_tags_valid (tags);\r
+@@ -395,10 +328,15 @@ do_search_tags (notmuch_database_t *notmuch,\r
+ {\r
+ tag = notmuch_tags_get (tags);\r
+ \r
+- if (! first_tag)\r
+- fputs (format->item_sep, stdout);\r
++ if (format == sprinter_text && ! first_tag)\r
++ fputs (text_item_sep, stdout);\r
+ \r
+- format->item_id (tags, "", tag);\r
++ if (format == sprinter_text)\r
++ fputs (tag, stdout);\r
++ else {\r
++ format->string (format, tag);\r
++ format->frame (format);\r
++ }\r
+ \r
+ first_tag = 0;\r
+ }\r
+@@ -408,10 +346,14 @@ do_search_tags (notmuch_database_t *notmuch,\r
+ if (messages)\r
+ notmuch_messages_destroy (messages);\r
+ \r
+- if (first_tag)\r
+- fputs (format->results_null, stdout);\r
+- else\r
+- fputs (format->results_end, stdout);\r
++ if (format == sprinter_text)\r
++ if (first_tag)\r
++ fputs (text_results_null, stdout);\r
++ else\r
++ fputs (text_results_end, stdout);\r
++ else {\r
++ format->end (format);\r
++ }\r
+ \r
+ return 0;\r
+ }\r
+@@ -430,7 +372,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+ notmuch_query_t *query;\r
+ char *query_str;\r
+ notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST;\r
+- const search_format_t *format = &format_text;\r
++ sprinter_t *format = NULL; /* the default output is text */\r
+ int opt_index, ret;\r
+ output_t output = OUTPUT_SUMMARY;\r
+ int offset = 0;\r
+@@ -475,10 +417,10 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+ \r
+ switch (format_sel) {\r
+ case NOTMUCH_FORMAT_TEXT:\r
+- format = &format_text;\r
++ format = NULL;\r
+ break;\r
+ case NOTMUCH_FORMAT_JSON:\r
+- format = &format_json;\r
++ format = sprinter_json_new (ctx, stdout);\r
+ break;\r
+ }\r
+ \r
+@@ -546,5 +488,8 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+ notmuch_query_destroy (query);\r
+ notmuch_database_destroy (notmuch);\r
+ \r
++ if (format != sprinter_text)\r
++ talloc_free(format);\r
++\r
+ return ret;\r
+ }\r
+diff --git a/test/json b/test/json\r
+index 6439788..88b8a6d 100755\r
+--- a/test/json\r
++++ b/test/json\r
+@@ -10,14 +10,8 @@ test_expect_equal "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"e\r
+ test_begin_subtest "Search message: json"\r
+ add_message "[subject]=\"json-search-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"json-search-message\""\r
+ output=$(notmuch search --format=json "json-search-message" | notmuch_search_sanitize)\r
+-test_expect_equal "$output" "[{\"thread\": \"XXX\",\r
+-\"timestamp\": 946728000,\r
+-\"date_relative\": \"2000-01-01\",\r
+-\"matched\": 1,\r
+-\"total\": 1,\r
+-\"authors\": \"Notmuch Test Suite\",\r
+-\"subject\": \"json-search-subject\",\r
+-\"tags\": [\"inbox\", \"unread\"]}]"\r
++test_expect_equal "$output" "[{\"thread\": \"XXX\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"matched\": 1, \"total\": 1, \"authors\": \"Notmuch Test Suite\", \"subject\": \"json-search-subject\", \"tags\": [\"inbox\", \"unread\"]}\r
++]"\r
+ \r
+ test_begin_subtest "Show message: json, utf-8"\r
+ add_message "[subject]=\"json-show-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"jsön-show-méssage\""\r
+@@ -40,13 +34,7 @@ test_expect_equal "$output" "[[[{\"id\": \"$id\", \"match\": true, \"excluded\":\r
+ test_begin_subtest "Search message: json, utf-8"\r
+ add_message "[subject]=\"json-search-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"jsön-search-méssage\""\r
+ output=$(notmuch search --format=json "jsön-search-méssage" | notmuch_search_sanitize)\r
+-test_expect_equal "$output" "[{\"thread\": \"XXX\",\r
+-\"timestamp\": 946728000,\r
+-\"date_relative\": \"2000-01-01\",\r
+-\"matched\": 1,\r
+-\"total\": 1,\r
+-\"authors\": \"Notmuch Test Suite\",\r
+-\"subject\": \"json-search-utf8-body-sübjéct\",\r
+-\"tags\": [\"inbox\", \"unread\"]}]"\r
++test_expect_equal "$output" "[{\"thread\": \"XXX\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"matched\": 1, \"total\": 1, \"authors\": \"Notmuch Test Suite\", \"subject\": \"json-search-utf8-body-sübjéct\", \"tags\": [\"inbox\", \"unread\"]}\r
++]"\r
+ \r
+ test_done\r
+diff --git a/test/search-output b/test/search-output\r
+index 8b57a43..f2650f7 100755\r
+--- a/test/search-output\r
++++ b/test/search-output\r
+@@ -37,30 +37,31 @@ test_expect_equal_file OUTPUT EXPECTED\r
+ test_begin_subtest "--output=threads --format=json"\r
+ notmuch search --format=json --output=threads '*' | sed -e s/\".*\"/\"THREADID\"/ >OUTPUT\r
+ cat <<EOF >EXPECTED\r
+-["THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID",\r
+-"THREADID"]\r
++["THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++, "THREADID"\r
++]\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+@@ -125,58 +126,59 @@ test_expect_equal_file OUTPUT EXPECTED\r
+ test_begin_subtest "--output=messages --format=json"\r
+ notmuch search --format=json --output=messages '*' >OUTPUT\r
+ cat <<EOF >EXPECTED\r
+-["4EFC743A.3060609@april.org",\r
+-"877h1wv7mg.fsf@inf-8657.int-evry.fr",\r
+-"1258544095-16616-1-git-send-email-chris@chris-wilson.co.uk",\r
+-"877htoqdbo.fsf@yoom.home.cworth.org",\r
+-"878we4qdqf.fsf@yoom.home.cworth.org",\r
+-"87aaykqe24.fsf@yoom.home.cworth.org",\r
+-"87bpj0qeng.fsf@yoom.home.cworth.org",\r
+-"87fx8cqf8v.fsf@yoom.home.cworth.org",\r
+-"87hbssqfix.fsf@yoom.home.cworth.org",\r
+-"87iqd8qgiz.fsf@yoom.home.cworth.org",\r
+-"87k4xoqgnl.fsf@yoom.home.cworth.org",\r
+-"87ocn0qh6d.fsf@yoom.home.cworth.org",\r
+-"87pr7gqidx.fsf@yoom.home.cworth.org",\r
+-"867hto2p0t.fsf@fortitudo.i-did-not-set--mail-host-address--so-tickle-me",\r
+-"1258532999-9316-1-git-send-email-keithp@keithp.com",\r
+-"86aayk2rbj.fsf@fortitudo.i-did-not-set--mail-host-address--so-tickle-me",\r
+-"86d43g2w3y.fsf@fortitudo.i-did-not-set--mail-host-address--so-tickle-me",\r
+-"ddd65cda0911172214t60d22b63hcfeb5a19ab54a39b@mail.gmail.com",\r
+-"86einw2xof.fsf@fortitudo.i-did-not-set--mail-host-address--so-tickle-me",\r
+-"736613.51770.qm@web113505.mail.gq1.yahoo.com",\r
+-"1258520223-15328-1-git-send-email-jan@ryngle.com",\r
+-"ddd65cda0911171950o4eea4389v86de9525e46052d3@mail.gmail.com",\r
+-"1258510940-7018-1-git-send-email-stewart@flamingspork.com",\r
+-"yunzl6kd1w0.fsf@aiko.keithp.com",\r
+-"yun1vjwegii.fsf@aiko.keithp.com",\r
+-"yun3a4cegoa.fsf@aiko.keithp.com",\r
+-"1258509400-32511-1-git-send-email-stewart@flamingspork.com",\r
+-"1258506353-20352-1-git-send-email-stewart@flamingspork.com",\r
+-"20091118010116.GC25380@dottiness.seas.harvard.edu",\r
+-"20091118005829.GB25380@dottiness.seas.harvard.edu",\r
+-"20091118005040.GA25380@dottiness.seas.harvard.edu",\r
+-"cf0c4d610911171623q3e27a0adx802e47039b57604b@mail.gmail.com",\r
+-"1258500222-32066-1-git-send-email-ingmar@exherbo.org",\r
+-"20091117232137.GA7669@griffis1.net",\r
+-"20091118002059.067214ed@hikari",\r
+-"1258498485-sup-142@elly",\r
+-"f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.gmail.com",\r
+-"f35dbb950911171435ieecd458o853c873e35f4be95@mail.gmail.com",\r
+-"1258496327-12086-1-git-send-email-jan@ryngle.com",\r
+-"1258493565-13508-1-git-send-email-keithp@keithp.com",\r
+-"yunaayketfm.fsf@aiko.keithp.com",\r
+-"yunbpj0etua.fsf@aiko.keithp.com",\r
+-"1258491078-29658-1-git-send-email-dottedmag@dottedmag.net",\r
+-"87fx8can9z.fsf@vertex.dottedmag",\r
+-"20091117203301.GV3165@dottiness.seas.harvard.edu",\r
+-"87lji4lx9v.fsf@yoom.home.cworth.org",\r
+-"cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com",\r
+-"87iqd9rn3l.fsf@vertex.dottedmag",\r
+-"20091117190054.GU3165@dottiness.seas.harvard.edu",\r
+-"87lji5cbwo.fsf@yoom.home.cworth.org",\r
+-"1258471718-6781-2-git-send-email-dottedmag@dottedmag.net",\r
+-"1258471718-6781-1-git-send-email-dottedmag@dottedmag.net"]\r
++["4EFC743A.3060609@april.org"\r
++, "877h1wv7mg.fsf@inf-8657.int-evry.fr"\r
++, "1258544095-16616-1-git-send-email-chris@chris-wilson.co.uk"\r
++, "877htoqdbo.fsf@yoom.home.cworth.org"\r
++, "878we4qdqf.fsf@yoom.home.cworth.org"\r
++, "87aaykqe24.fsf@yoom.home.cworth.org"\r
++, "87bpj0qeng.fsf@yoom.home.cworth.org"\r
++, "87fx8cqf8v.fsf@yoom.home.cworth.org"\r
++, "87hbssqfix.fsf@yoom.home.cworth.org"\r
++, "87iqd8qgiz.fsf@yoom.home.cworth.org"\r
++, "87k4xoqgnl.fsf@yoom.home.cworth.org"\r
++, "87ocn0qh6d.fsf@yoom.home.cworth.org"\r
++, "87pr7gqidx.fsf@yoom.home.cworth.org"\r
++, "867hto2p0t.fsf@fortitudo.i-did-not-set--mail-host-address--so-tickle-me"\r
++, "1258532999-9316-1-git-send-email-keithp@keithp.com"\r
++, "86aayk2rbj.fsf@fortitudo.i-did-not-set--mail-host-address--so-tickle-me"\r
++, "86d43g2w3y.fsf@fortitudo.i-did-not-set--mail-host-address--so-tickle-me"\r
++, "ddd65cda0911172214t60d22b63hcfeb5a19ab54a39b@mail.gmail.com"\r
++, "86einw2xof.fsf@fortitudo.i-did-not-set--mail-host-address--so-tickle-me"\r
++, "736613.51770.qm@web113505.mail.gq1.yahoo.com"\r
++, "1258520223-15328-1-git-send-email-jan@ryngle.com"\r
++, "ddd65cda0911171950o4eea4389v86de9525e46052d3@mail.gmail.com"\r
++, "1258510940-7018-1-git-send-email-stewart@flamingspork.com"\r
++, "yunzl6kd1w0.fsf@aiko.keithp.com"\r
++, "yun1vjwegii.fsf@aiko.keithp.com"\r
++, "yun3a4cegoa.fsf@aiko.keithp.com"\r
++, "1258509400-32511-1-git-send-email-stewart@flamingspork.com"\r
++, "1258506353-20352-1-git-send-email-stewart@flamingspork.com"\r
++, "20091118010116.GC25380@dottiness.seas.harvard.edu"\r
++, "20091118005829.GB25380@dottiness.seas.harvard.edu"\r
++, "20091118005040.GA25380@dottiness.seas.harvard.edu"\r
++, "cf0c4d610911171623q3e27a0adx802e47039b57604b@mail.gmail.com"\r
++, "1258500222-32066-1-git-send-email-ingmar@exherbo.org"\r
++, "20091117232137.GA7669@griffis1.net"\r
++, "20091118002059.067214ed@hikari"\r
++, "1258498485-sup-142@elly"\r
++, "f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.gmail.com"\r
++, "f35dbb950911171435ieecd458o853c873e35f4be95@mail.gmail.com"\r
++, "1258496327-12086-1-git-send-email-jan@ryngle.com"\r
++, "1258493565-13508-1-git-send-email-keithp@keithp.com"\r
++, "yunaayketfm.fsf@aiko.keithp.com"\r
++, "yunbpj0etua.fsf@aiko.keithp.com"\r
++, "1258491078-29658-1-git-send-email-dottedmag@dottedmag.net"\r
++, "87fx8can9z.fsf@vertex.dottedmag"\r
++, "20091117203301.GV3165@dottiness.seas.harvard.edu"\r
++, "87lji4lx9v.fsf@yoom.home.cworth.org"\r
++, "cf0c4d610911171136h1713aa59w9cf9aa31f052ad0a@mail.gmail.com"\r
++, "87iqd9rn3l.fsf@vertex.dottedmag"\r
++, "20091117190054.GU3165@dottiness.seas.harvard.edu"\r
++, "87lji5cbwo.fsf@yoom.home.cworth.org"\r
++, "1258471718-6781-2-git-send-email-dottedmag@dottedmag.net"\r
++, "1258471718-6781-1-git-send-email-dottedmag@dottedmag.net"\r
++]\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+@@ -242,59 +244,60 @@ test_expect_equal_file OUTPUT EXPECTED\r
+ test_begin_subtest "--output=files --format=json"\r
+ notmuch search --format=json --output=files '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT\r
+ cat <<EOF >EXPECTED\r
+-["MAIL_DIR/cur/52:2,",\r
+-"MAIL_DIR/cur/53:2,",\r
+-"MAIL_DIR/cur/50:2,",\r
+-"MAIL_DIR/cur/49:2,",\r
+-"MAIL_DIR/cur/48:2,",\r
+-"MAIL_DIR/cur/47:2,",\r
+-"MAIL_DIR/cur/46:2,",\r
+-"MAIL_DIR/cur/45:2,",\r
+-"MAIL_DIR/cur/44:2,",\r
+-"MAIL_DIR/cur/43:2,",\r
+-"MAIL_DIR/cur/42:2,",\r
+-"MAIL_DIR/cur/41:2,",\r
+-"MAIL_DIR/cur/40:2,",\r
+-"MAIL_DIR/cur/39:2,",\r
+-"MAIL_DIR/cur/38:2,",\r
+-"MAIL_DIR/cur/37:2,",\r
+-"MAIL_DIR/cur/36:2,",\r
+-"MAIL_DIR/cur/35:2,",\r
+-"MAIL_DIR/cur/34:2,",\r
+-"MAIL_DIR/cur/33:2,",\r
+-"MAIL_DIR/cur/32:2,",\r
+-"MAIL_DIR/cur/31:2,",\r
+-"MAIL_DIR/cur/30:2,",\r
+-"MAIL_DIR/cur/29:2,",\r
+-"MAIL_DIR/cur/28:2,",\r
+-"MAIL_DIR/cur/27:2,",\r
+-"MAIL_DIR/cur/26:2,",\r
+-"MAIL_DIR/cur/25:2,",\r
+-"MAIL_DIR/cur/24:2,",\r
+-"MAIL_DIR/cur/23:2,",\r
+-"MAIL_DIR/cur/22:2,",\r
+-"MAIL_DIR/cur/21:2,",\r
+-"MAIL_DIR/cur/19:2,",\r
+-"MAIL_DIR/cur/18:2,",\r
+-"MAIL_DIR/cur/51:2,",\r
+-"MAIL_DIR/cur/20:2,",\r
+-"MAIL_DIR/cur/17:2,",\r
+-"MAIL_DIR/cur/16:2,",\r
+-"MAIL_DIR/cur/15:2,",\r
+-"MAIL_DIR/cur/14:2,",\r
+-"MAIL_DIR/cur/13:2,",\r
+-"MAIL_DIR/cur/12:2,",\r
+-"MAIL_DIR/cur/11:2,",\r
+-"MAIL_DIR/cur/10:2,",\r
+-"MAIL_DIR/cur/09:2,",\r
+-"MAIL_DIR/cur/08:2,",\r
+-"MAIL_DIR/cur/06:2,",\r
+-"MAIL_DIR/cur/05:2,",\r
+-"MAIL_DIR/cur/04:2,",\r
+-"MAIL_DIR/cur/03:2,",\r
+-"MAIL_DIR/cur/07:2,",\r
+-"MAIL_DIR/cur/02:2,",\r
+-"MAIL_DIR/cur/01:2,"]\r
++["MAIL_DIR/cur/52:2,"\r
++, "MAIL_DIR/cur/53:2,"\r
++, "MAIL_DIR/cur/50:2,"\r
++, "MAIL_DIR/cur/49:2,"\r
++, "MAIL_DIR/cur/48:2,"\r
++, "MAIL_DIR/cur/47:2,"\r
++, "MAIL_DIR/cur/46:2,"\r
++, "MAIL_DIR/cur/45:2,"\r
++, "MAIL_DIR/cur/44:2,"\r
++, "MAIL_DIR/cur/43:2,"\r
++, "MAIL_DIR/cur/42:2,"\r
++, "MAIL_DIR/cur/41:2,"\r
++, "MAIL_DIR/cur/40:2,"\r
++, "MAIL_DIR/cur/39:2,"\r
++, "MAIL_DIR/cur/38:2,"\r
++, "MAIL_DIR/cur/37:2,"\r
++, "MAIL_DIR/cur/36:2,"\r
++, "MAIL_DIR/cur/35:2,"\r
++, "MAIL_DIR/cur/34:2,"\r
++, "MAIL_DIR/cur/33:2,"\r
++, "MAIL_DIR/cur/32:2,"\r
++, "MAIL_DIR/cur/31:2,"\r
++, "MAIL_DIR/cur/30:2,"\r
++, "MAIL_DIR/cur/29:2,"\r
++, "MAIL_DIR/cur/28:2,"\r
++, "MAIL_DIR/cur/27:2,"\r
++, "MAIL_DIR/cur/26:2,"\r
++, "MAIL_DIR/cur/25:2,"\r
++, "MAIL_DIR/cur/24:2,"\r
++, "MAIL_DIR/cur/23:2,"\r
++, "MAIL_DIR/cur/22:2,"\r
++, "MAIL_DIR/cur/21:2,"\r
++, "MAIL_DIR/cur/19:2,"\r
++, "MAIL_DIR/cur/18:2,"\r
++, "MAIL_DIR/cur/51:2,"\r
++, "MAIL_DIR/cur/20:2,"\r
++, "MAIL_DIR/cur/17:2,"\r
++, "MAIL_DIR/cur/16:2,"\r
++, "MAIL_DIR/cur/15:2,"\r
++, "MAIL_DIR/cur/14:2,"\r
++, "MAIL_DIR/cur/13:2,"\r
++, "MAIL_DIR/cur/12:2,"\r
++, "MAIL_DIR/cur/11:2,"\r
++, "MAIL_DIR/cur/10:2,"\r
++, "MAIL_DIR/cur/09:2,"\r
++, "MAIL_DIR/cur/08:2,"\r
++, "MAIL_DIR/cur/06:2,"\r
++, "MAIL_DIR/cur/05:2,"\r
++, "MAIL_DIR/cur/04:2,"\r
++, "MAIL_DIR/cur/03:2,"\r
++, "MAIL_DIR/cur/07:2,"\r
++, "MAIL_DIR/cur/02:2,"\r
++, "MAIL_DIR/cur/01:2,"\r
++]\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+@@ -311,10 +314,11 @@ test_expect_equal_file OUTPUT EXPECTED\r
+ test_begin_subtest "--output=tags --format=json"\r
+ notmuch search --format=json --output=tags '*' >OUTPUT\r
+ cat <<EOF >EXPECTED\r
+-["attachment",\r
+-"inbox",\r
+-"signed",\r
+-"unread"]\r
++["attachment"\r
++, "inbox"\r
++, "signed"\r
++, "unread"\r
++]\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+-- \r
+1.7.11.1\r
+\r
projects / notmuch-archives.git / commitdiff