From 815f6d0e28080f9bf02756d241b502a69c231b3d Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 25 Jul 2012 22:34:49 +2000 Subject: [PATCH] [PATCH 09/13] show: Convert non-envelope format_part_json to use sprinter --- 6f/2c3c2766ebbd0067b6dfb5fadf816a2faafb53 | 206 ++++++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100644 6f/2c3c2766ebbd0067b6dfb5fadf816a2faafb53 diff --git a/6f/2c3c2766ebbd0067b6dfb5fadf816a2faafb53 b/6f/2c3c2766ebbd0067b6dfb5fadf816a2faafb53 new file mode 100644 index 000000000..071ed30da --- /dev/null +++ b/6f/2c3c2766ebbd0067b6dfb5fadf816a2faafb53 @@ -0,0 +1,206 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id EF512431FD7 + for ; Tue, 24 Jul 2012 19:35:06 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id PEuWIeXz8wSt for ; + Tue, 24 Jul 2012 19:35:05 -0700 (PDT) +Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU + [18.9.25.14]) + by olra.theworths.org (Postfix) with ESMTP id A4293431FAF + for ; Tue, 24 Jul 2012 19:35:05 -0700 (PDT) +X-AuditID: 1209190e-b7fb56d0000008b2-fb-500f5b59f02f +Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) + by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP + id 03.7F.02226.95B5F005; Tue, 24 Jul 2012 22:35:05 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q6P2Z5pd011175; + Tue, 24 Jul 2012 22:35:05 -0400 +Received: from drake.dyndns.org + (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [209.6.116.242]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q6P2Z2dB025128 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Tue, 24 Jul 2012 22:35:04 -0400 (EDT) +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1StrRG-0004a2-MY; Tue, 24 Jul 2012 22:35:02 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH 09/13] show: Convert non-envelope format_part_json to use + sprinter +Date: Tue, 24 Jul 2012 22:34:49 -0400 +Message-Id: <1343183693-17134-10-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1343183693-17134-1-git-send-email-amdragon@mit.edu> +References: <1343183693-17134-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixCmqrBsZzR9gsH2XqMXehnZGi+s3ZzI7 + MHks3rSfzePZqlvMAUxRXDYpqTmZZalF+nYJXBmn3jxmKdioVNH89xRTA+NE6S5GTg4JAROJ + b8e6WSBsMYkL99azgdhCAvsYJfrOl3cxcgHZGxglXp+cxgThPGKSePnoHzOEM5dR4sO8iWDt + bAIaEtv2L2cEsUUEpCV23p3NCmIzC5hJzP05EWgsB4ewQJBE30lxkDCLgKrE2Z5OsBJeAUeJ + I5u3skJcIS/x9H4f2BWcQPHzSxYyQlzkINGz+Br7BEb+BYwMqxhlU3KrdHMTM3OKU5N1i5MT + 8/JSi3SN9XIzS/RSU0o3MYIDSZJvB+PXg0qHGAU4GJV4eH8/4QsQYk0sK67MPcQoycGkJMpb + EcwfIMSXlJ9SmZFYnBFfVJqTWnyIUYKDWUmEtygMKMebklhZlVqUD5OS5mBREue9knLTX0gg + PbEkNTs1tSC1CCYrw8GhJMHbGgXUKFiUmp5akZaZU4KQZuLgBBnOAzR8N0gNb3FBYm5xZjpE + /hSjopQ471yQhABIIqM0D64XFumvGMWBXhHmbQap4gEmCbjuV0CDmYAGPw/jAxlckoiQkmpg + FDTWmSLw7aJQ5e0pK4+EiBoGuBmvXvjb1TUqYdbUb0y3QrbU9mxX8/jbtXn7DK5nYhGcQZMv + 75l3ubYzTqbtX+c3wWO7WyY4bYmZfGLiQsOLkotEbic7dEY0xHzdsMNM+sSmFasT5rS/y1zL + tlmo0U9v9qyzbA+6znsUHfjGfkP+obwDy6/IRCWW4oxEQy3mouJEAIOcPvfPAgAA +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 25 Jul 2012 02:35:07 -0000 + +--- + notmuch-show.c | 74 +++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 46 insertions(+), 28 deletions(-) + +diff --git a/notmuch-show.c b/notmuch-show.c +index 3ff32df..afbd9d0 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -588,7 +588,6 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node, + return; + } + +- void *local = talloc_new (ctx); + /* The disposition and content-type metadata are associated with + * the envelope for message parts */ + GMimeObject *meta = node->envelope_part ? +@@ -597,31 +596,41 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node, + const char *cid = g_mime_object_get_content_id (meta); + const char *filename = GMIME_IS_PART (node->part) ? + g_mime_part_get_filename (GMIME_PART (node->part)) : NULL; +- const char *terminator = ""; ++ int nclose = 0; + int i; + +- if (!first) +- printf (", "); ++ sp->begin_map (sp); + +- printf ("{\"id\": %d", node->part_num); ++ sp->map_key (sp, "id"); ++ sp->integer (sp, node->part_num); + +- if (node->decrypt_attempted) +- printf (", \"encstatus\": [{\"status\": \"%s\"}]", +- node->decrypt_success ? "good" : "bad"); ++ if (node->decrypt_attempted) { ++ sp->map_key (sp, "encstatus"); ++ sp->begin_list (sp); ++ sp->begin_map (sp); ++ sp->map_key (sp, "status"); ++ sp->string (sp, node->decrypt_success ? "good" : "bad"); ++ sp->end (sp); ++ sp->end (sp); ++ } + + if (node->verify_attempted) { +- printf (", \"sigstatus\": "); ++ sp->map_key (sp, "sigstatus"); + format_part_sigstatus_json (sp, node); + } + +- printf (", \"content-type\": %s", +- json_quote_str (local, g_mime_content_type_to_string (content_type))); ++ sp->map_key (sp, "content-type"); ++ sp->string (sp, g_mime_content_type_to_string (content_type)); + +- if (cid) +- printf (", \"content-id\": %s", json_quote_str (local, cid)); ++ if (cid) { ++ sp->map_key (sp, "content-id"); ++ sp->string (sp, cid); ++ } + +- if (filename) +- printf (", \"filename\": %s", json_quote_str (local, filename)); ++ if (filename) { ++ sp->map_key (sp, "filename"); ++ sp->string (sp, filename); ++ } + + if (GMIME_IS_PART (node->part)) { + /* For non-HTML text parts, we include the content in the +@@ -636,35 +645,44 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node, + if (g_mime_content_type_is_type (content_type, "text", "html")) { + const char *content_charset = g_mime_object_get_content_type_parameter (meta, "charset"); + +- if (content_charset != NULL) +- printf (", \"content-charset\": %s", json_quote_str (local, content_charset)); ++ if (content_charset != NULL) { ++ sp->map_key (sp, "content-charset"); ++ sp->string (sp, content_charset); ++ } + } else if (g_mime_content_type_is_type (content_type, "text", "*")) { + GMimeStream *stream_memory = g_mime_stream_mem_new (); + GByteArray *part_content; + show_text_part_content (node->part, stream_memory, 0); + part_content = g_mime_stream_mem_get_byte_array (GMIME_STREAM_MEM (stream_memory)); +- +- printf (", \"content\": %s", json_quote_chararray (local, (char *) part_content->data, part_content->len)); ++ sp->map_key (sp, "content"); ++ sp->string_len (sp, (char *) part_content->data, part_content->len); + g_object_unref (stream_memory); + } + } else if (GMIME_IS_MULTIPART (node->part)) { +- printf (", \"content\": ["); +- terminator = "]"; ++ sp->map_key (sp, "content"); ++ sp->begin_list (sp); ++ nclose = 1; + } else if (GMIME_IS_MESSAGE (node->part)) { +- printf (", \"content\": [{"); +- printf ("\"headers\": "); ++ sp->map_key (sp, "content"); ++ sp->begin_list (sp); ++ sp->begin_map (sp); ++ ++ sp->map_key (sp, "headers"); + format_headers_json (sp, GMIME_MESSAGE (node->part), FALSE); + +- printf (", \"body\": ["); +- terminator = "]}]"; ++ sp->map_key (sp, "body"); ++ sp->begin_list (sp); ++ nclose = 3; + } + +- talloc_free (local); +- + for (i = 0; i < node->nchildren; i++) + format_part_json (ctx, sp, mime_node_child (node, i), i == 0, TRUE); + +- printf ("%s}", terminator); ++ /* Close content structures */ ++ for (i = 0; i < nclose; i++) ++ sp->end (sp); ++ /* Close part map */ ++ sp->end (sp); + } + + static notmuch_status_t +-- +1.7.10 + -- 2.26.2