--- /dev/null
+Return-Path: <tomi.ollila@iki.fi>\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 DE2CC431FBC\r
+ for <notmuch@notmuchmail.org>; Fri, 20 Jul 2012 02:14:08 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\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 5kNdJfN71GQs for <notmuch@notmuchmail.org>;\r
+ Fri, 20 Jul 2012 02:14:07 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id 63AA0431FAE\r
+ for <notmuch@notmuchmail.org>; Fri, 20 Jul 2012 02:14:07 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+ id 48B7010014D; Fri, 20 Jul 2012 12:14:18 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: craven@gmx.net, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v7 3/3] Use the structured formatters in notmuch-search.c.\r
+In-Reply-To: <1342766173-1344-4-git-send-email-craven@gmx.net>\r
+References: <20120718194819.GP31670@mit.edu>\r
+ <1342766173-1344-1-git-send-email-craven@gmx.net>\r
+ <1342766173-1344-4-git-send-email-craven@gmx.net>\r
+User-Agent: Notmuch/0.13.2+93~ge4fdd97 (http://notmuchmail.org) Emacs/23.1.1\r
+ (x86_64-redhat-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Fri, 20 Jul 2012 12:14:17 +0300\r
+Message-ID: <m2r4s694ly.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Transfer-Encoding: quoted-printable\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: Fri, 20 Jul 2012 09:14:09 -0000\r
+\r
+On Fri, Jul 20 2012, craven@gmx.net wrote:\r
+\r
+> From: <craven@gmx.net>\r
+>\r
+> This patch switches from the current ad-hoc printer to the structured\r
+> formatters in sprinter.h, sprinter-text.c and sprinter-json.c.\r
+>\r
+> The JSON tests are changed slightly in order to make them PASS for the\r
+> new structured output formatter.\r
+>\r
+> The text tests pass without adaptation.\r
+> ---\r
+> notmuch-search.c | 301 ++++++++++++++++---------------------------------=\r
+------\r
+> test/json | 34 ++++---\r
+> 2 files changed, 103 insertions(+), 232 deletions(-)\r
+>\r
+> diff --git a/notmuch-search.c b/notmuch-search.c\r
+> index 3be296d..07211e8 100644\r
+> --- a/notmuch-search.c\r
+> +++ b/notmuch-search.c\r
+> @@ -19,6 +19,7 @@\r
+> */\r
+>=20=20\r
+> #include "notmuch-client.h"\r
+> +#include "sprinter.h"\r
+>=20=20\r
+> typedef enum {\r
+> OUTPUT_SUMMARY,\r
+> @@ -28,92 +29,6 @@ typedef enum {\r
+> OUTPUT_TAGS\r
+> } output_t;\r
+>=20=20\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 =3D {\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 =3D {\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
+> -\r
+> static char *\r
+> sanitize_string (const void *ctx, const char *str)\r
+> {\r
+> @@ -131,72 +46,8 @@ sanitize_string (const void *ctx, const char *str)\r
+> return out;\r
+> }\r
+>=20=20\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 =3D 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 =3D talloc_new (ctx);\r
+> -\r
+> - printf ("%s", json_quote_str (ctx_quote, item_id));\r
+> -\r
+> - talloc_free (ctx_quote);\r
+> -=20=20=20=20\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 =3D 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
+> @@ -207,7 +58,6 @@ do_search_threads (const search_format_t *format,\r
+> notmuch_threads_t *threads;\r
+> notmuch_tags_t *tags;\r
+> time_t date;\r
+> - int first_thread =3D 1;\r
+> int i;\r
+>=20=20\r
+> if (offset < 0) {\r
+> @@ -220,14 +70,12 @@ do_search_threads (const search_format_t *format,\r
+> if (threads =3D=3D NULL)\r
+> return 1;\r
+>=20=20\r
+> - fputs (format->results_start, stdout);\r
+> + format->begin_list (format);\r
+>=20=20\r
+> for (i =3D 0;\r
+> notmuch_threads_valid (threads) && (limit < 0 || i < offset + limit);\r
+> notmuch_threads_move_to_next (threads), i++)\r
+> {\r
+> - int first_tag =3D 1;\r
+> -\r
+> thread =3D notmuch_threads_get (threads);\r
+>=20=20\r
+> if (i < offset) {\r
+> @@ -235,60 +83,97 @@ do_search_threads (const search_format_t *format,\r
+> continue;\r
+> }\r
+>=20=20\r
+> - if (! first_thread)\r
+> - fputs (format->item_sep, stdout);\r
+> -\r
+> if (output =3D=3D OUTPUT_THREADS) {\r
+> - format->item_id (thread, "thread:",\r
+> - notmuch_thread_get_thread_id (thread));\r
+> + format->set_prefix (format, "thread");\r
+> + format->string (format,\r
+> + notmuch_thread_get_thread_id (thread));\r
+> + format->separator (format);\r
+> } else { /* output =3D=3D OUTPUT_SUMMARY */\r
+> - fputs (format->item_start, stdout);\r
+> + void *ctx_quote =3D talloc_new (thread);\r
+> + const char *authors =3D notmuch_thread_get_authors (thread);\r
+> + const char *subject =3D notmuch_thread_get_subject (thread);\r
+> + const char *thread_id =3D notmuch_thread_get_thread_id (thread);\r
+> + int matched =3D notmuch_thread_get_matched_messages (thread);\r
+> + int total =3D notmuch_thread_get_total_messages (thread);\r
+> + const char *relative_date =3D NULL;\r
+> + notmuch_bool_t first_tag =3D TRUE;\r
+> +\r
+> + format->begin_map (format);\r
+>=20=20\r
+> if (sort =3D=3D NOTMUCH_SORT_OLDEST_FIRST)\r
+> date =3D notmuch_thread_get_oldest_date (thread);\r
+> else\r
+> date =3D notmuch_thread_get_newest_date (thread);\r
+>=20=20\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
+> + relative_date =3D notmuch_time_relative_date (ctx_quote, date);\r
+> +\r
+> + if (format->is_text_printer) {\r
+> + /* Special case for the text formatter */\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 { /* Structured Output */\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
+>=20=20\r
+> - fputs (format->tag_start, stdout);\r
+> + format->map_key (format, "tags");\r
+> + format->begin_list (format);\r
+>=20=20\r
+> for (tags =3D 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
+> - first_tag =3D 0;\r
+> + const char *tag =3D notmuch_tags_get (tags);\r
+> +\r
+> + if (format->is_text_printer) {\r
+> + /* Special case for the text formatter */\r
+> + if (first_tag)\r
+> + first_tag =3D FALSE;\r
+> + else\r
+> + fputc (' ', stdout);\r
+> + fputs (tag, stdout);\r
+> + } else { /* Structured Output */\r
+> + format->string (format, tag);\r
+> + }\r
+> }\r
+>=20=20\r
+> - fputs (format->tag_end, stdout);\r
+> + if (format->is_text_printer)\r
+> + printf (")");\r
+>=20=20\r
+> - fputs (format->item_end, stdout);\r
+> + format->end (format);\r
+> + format->end (format);\r
+> + format->separator (format);\r
+> }\r
+>=20=20\r
+> - first_thread =3D 0;\r
+> -\r
+> notmuch_thread_destroy (thread);\r
+> }\r
+>=20=20\r
+> - if (first_thread)\r
+> - fputs (format->results_null, stdout);\r
+> - else\r
+> - fputs (format->results_end, stdout);\r
+> + format->end (format);\r
+>=20=20\r
+> return 0;\r
+> }\r
+>=20=20\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
+> @@ -297,7 +182,6 @@ do_search_messages (const search_format_t *format,\r
+> notmuch_message_t *message;\r
+> notmuch_messages_t *messages;\r
+> notmuch_filenames_t *filenames;\r
+> - int first_message =3D 1;\r
+> int i;\r
+>=20=20\r
+> if (offset < 0) {\r
+> @@ -310,7 +194,7 @@ do_search_messages (const search_format_t *format,\r
+> if (messages =3D=3D NULL)\r
+> return 1;\r
+>=20=20\r
+> - fputs (format->results_start, stdout);\r
+> + format->begin_list (format);\r
+>=20=20\r
+> for (i =3D 0;\r
+> notmuch_messages_valid (messages) && (limit < 0 || i < offset + limit);\r
+> @@ -328,24 +212,17 @@ 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
+> -\r
+> - format->item_id (message, "",\r
+> - notmuch_filenames_get (filenames));\r
+> -\r
+> - first_message =3D 0;\r
+> + format->string (format, notmuch_filenames_get (filenames));\r
+> + format->separator (format);\r
+> }\r
+>=20=20=09=20=20=20=20\r
+> notmuch_filenames_destroy( filenames );\r
+>=20=20\r
+> } else { /* output =3D=3D OUTPUT_MESSAGES */\r
+> - if (! first_message)\r
+> - fputs (format->item_sep, stdout);\r
+> -\r
+> - format->item_id (message, "id:",\r
+> - notmuch_message_get_message_id (message));\r
+> - first_message =3D 0;\r
+> + format->set_prefix (format, "id");\r
+> + format->string (format,\r
+> + notmuch_message_get_message_id (message));\r
+> + format->separator (format);\r
+> }\r
+>=20=20\r
+> notmuch_message_destroy (message);\r
+> @@ -353,23 +230,19 @@ do_search_messages (const search_format_t *format,\r
+>=20=20\r
+> notmuch_messages_destroy (messages);\r
+>=20=20\r
+> - if (first_message)\r
+> - fputs (format->results_null, stdout);\r
+> - else\r
+> - fputs (format->results_end, stdout);\r
+> + format->end (format);\r
+>=20=20\r
+> return 0;\r
+> }\r
+>=20=20\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 =3D NULL;\r
+> notmuch_tags_t *tags;\r
+> const char *tag;\r
+> - int first_tag =3D 1;\r
+>=20=20\r
+> /* should the following only special case if no excluded terms\r
+> * specified? */\r
+> @@ -387,7 +260,7 @@ do_search_tags (notmuch_database_t *notmuch,\r
+> if (tags =3D=3D NULL)\r
+> return 1;\r
+>=20=20\r
+> - fputs (format->results_start, stdout);\r
+> + format->begin_list (format);\r
+>=20=20\r
+> for (;\r
+> notmuch_tags_valid (tags);\r
+> @@ -395,12 +268,9 @@ do_search_tags (notmuch_database_t *notmuch,\r
+> {\r
+> tag =3D notmuch_tags_get (tags);\r
+>=20=20\r
+> - if (! first_tag)\r
+> - fputs (format->item_sep, stdout);\r
+> + format->string (format, tag);\r
+> + format->separator (format);\r
+>=20=20\r
+> - format->item_id (tags, "", tag);\r
+> -\r
+> - first_tag =3D 0;\r
+> }\r
+>=20=20\r
+> notmuch_tags_destroy (tags);\r
+> @@ -408,10 +278,7 @@ do_search_tags (notmuch_database_t *notmuch,\r
+> if (messages)\r
+> notmuch_messages_destroy (messages);\r
+>=20=20\r
+> - if (first_tag)\r
+> - fputs (format->results_null, stdout);\r
+> - else\r
+> - fputs (format->results_end, stdout);\r
+> + format->end (format);\r
+>=20=20\r
+> return 0;\r
+> }\r
+> @@ -430,7 +297,7 @@ notmuch_search_command (void *ctx, int argc, char *ar=\r
+gv[])\r
+> notmuch_query_t *query;\r
+> char *query_str;\r
+> notmuch_sort_t sort =3D NOTMUCH_SORT_NEWEST_FIRST;\r
+> - const search_format_t *format =3D &format_text;\r
+> + sprinter_t *format =3D NULL;\r
+\r
+due to this change -- dropping "fallback" setting due to ...\r
+\r
+> int opt_index, ret;\r
+> output_t output =3D OUTPUT_SUMMARY;\r
+> int offset =3D 0;\r
+> @@ -475,10 +342,10 @@ notmuch_search_command (void *ctx, int argc, char *=\r
+argv[])\r
+>=20=20\r
+> switch (format_sel) {\r
+> case NOTMUCH_FORMAT_TEXT:\r
+> - format =3D &format_text;\r
+> + format =3D sprinter_text_create (ctx, stdout);\r
+> break;\r
+> case NOTMUCH_FORMAT_JSON:\r
+> - format =3D &format_json;\r
+> + format =3D sprinter_json_create (ctx, stdout);\r
+> break;\r
+> }\r
+\r
+... the dynamically created structure above, should we have 'default:'\r
+case which executes INTERNAL_ERROR() (or something) instead of allowing\r
+NULL derefencing (and crash) if one ever encounters such a situation ?\r
+\r
+Tomi\r
+\r
+\r
+> @@ -546,5 +413,7 @@ notmuch_search_command (void *ctx, int argc, char *ar=\r
+gv[])\r
+> notmuch_query_destroy (query);\r
+> notmuch_database_destroy (notmuch);\r
+>=20=20\r
+> + talloc_free (format);\r
+> +\r
+> return ret;\r
+> }\r
+> diff --git a/test/json b/test/json\r
+> index 6439788..337b3f5 100755\r
+> --- a/test/json\r
+> +++ b/test/json\r
+> @@ -9,15 +9,16 @@ test_expect_equal "$output" "[[[{\"id\": \"${gen_msg_id=\r
+}\", \"match\": true, \"e\r
+>=20=20\r
+> test_begin_subtest "Search message: json"\r
+> add_message "[subject]=3D\"json-search-subject\"" "[date]=3D\"Sat, 01 Ja=\r
+n 2000 12:00:00 -0000\"" "[body]=3D\"json-search-message\""\r
+> -output=3D$(notmuch search --format=3Djson "json-search-message" | notmuc=\r
+h_search_sanitize)\r
+> +output=3D$(notmuch search --format=3Djson "json-search-message" | notmuc=\r
+h_json_show_sanitize | 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
+> + \"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\",\r
+> + \"unread\"]}]"\r
+>=20=20\r
+> test_begin_subtest "Show message: json, utf-8"\r
+> add_message "[subject]=3D\"json-show-utf8-body-s=C3=BCbj=C3=A9ct\"" "[da=\r
+te]=3D\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=3D\"js=C3=B6n-show-m=C3=\r
+=A9ssage\""\r
+> @@ -39,14 +40,15 @@ test_expect_equal "$output" "[[[{\"id\": \"$id\", \"m=\r
+atch\": true, \"excluded\":\r
+>=20=20\r
+> test_begin_subtest "Search message: json, utf-8"\r
+> add_message "[subject]=3D\"json-search-utf8-body-s=C3=BCbj=C3=A9ct\"" "[=\r
+date]=3D\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=3D\"js=C3=B6n-search-m=\r
+=C3=A9ssage\""\r
+> -output=3D$(notmuch search --format=3Djson "js=C3=B6n-search-m=C3=A9ssage=\r
+" | notmuch_search_sanitize)\r
+> +output=3D$(notmuch search --format=3Djson "js=C3=B6n-search-m=C3=A9ssage=\r
+" | notmuch_json_show_sanitize | 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=C3=BCbj=C3=A9ct\",\r
+> -\"tags\": [\"inbox\", \"unread\"]}]"\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=C3=BCbj=C3=A9ct\",\r
+> + \"tags\": [\"inbox\",\r
+> + \"unread\"]}]"\r
+>=20=20\r
+> test_done\r
+> --=20\r
+> 1.7.11.2\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff