From: Mark Walters Date: Wed, 25 Jul 2012 19:03:40 +0000 (+0100) Subject: Re: [PATCH 10/13] show: Convert envelope format_part_json to use sprinter X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0ec66a4d660ef3b0e2bf013fe1676e40a7ba496e;p=notmuch-archives.git Re: [PATCH 10/13] show: Convert envelope format_part_json to use sprinter --- diff --git a/10/de5693c534ae729a5172ea6bb0b8c958adeb6e b/10/de5693c534ae729a5172ea6bb0b8c958adeb6e new file mode 100644 index 000000000..80334a6ec --- /dev/null +++ b/10/de5693c534ae729a5172ea6bb0b8c958adeb6e @@ -0,0 +1,195 @@ +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 32E27431FAF + for ; Wed, 25 Jul 2012 12:03:43 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 SkHYyThtQhSI for ; + Wed, 25 Jul 2012 12:03:42 -0700 (PDT) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 1AF19431FAE + for ; Wed, 25 Jul 2012 12:03:42 -0700 (PDT) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1Su6s0-0003km-DV; Wed, 25 Jul 2012 20:03:40 +0100 +Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223] + helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) + (envelope-from ) + id 1Su6s0-0001j5-1X; Wed, 25 Jul 2012 20:03:40 +0100 +From: Mark Walters +To: Austin Clements , notmuch@notmuchmail.org +Subject: Re: [PATCH 10/13] show: Convert envelope format_part_json to use + sprinter +In-Reply-To: <1343183693-17134-11-git-send-email-amdragon@mit.edu> +References: <1343183693-17134-1-git-send-email-amdragon@mit.edu> + <1343183693-17134-11-git-send-email-amdragon@mit.edu> +User-Agent: Notmuch/0.13.2+93~gf33b188 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Wed, 25 Jul 2012 20:03:40 +0100 +Message-ID: <874novirxv.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 94.192.233.223 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: ded7eccf8ef343a5cf8db2bb05f40a95 (of first 20000 bytes) +X-SpamAssassin-Score: -1.8 +X-SpamAssassin-SpamBar: - +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -1.8 points. + Summary of the scoring: + * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, + * medium trust + * [138.37.6.40 listed in list.dnswl.org] + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay + * domain + * 0.5 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +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 19:03:43 -0000 + +On Wed, 25 Jul 2012, Austin Clements wrote: +> --- +> notmuch-show.c | 57 +++++++++++++++++++++++++++++++++----------------------- +> 1 file changed, 34 insertions(+), 23 deletions(-) +> +> diff --git a/notmuch-show.c b/notmuch-show.c +> index afbd9d0..fa1e6e9 100644 +> --- a/notmuch-show.c +> +++ b/notmuch-show.c +> @@ -110,34 +110,44 @@ _get_one_line_summary (const void *ctx, notmuch_message_t *message) +> } +> +> static void +> -format_message_json (const void *ctx, notmuch_message_t *message) +> +format_message_json (sprinter_t *sp, notmuch_message_t *message) +> { + +It might be nice to have a comment for this function (and other similar ones) saying +what it prints: is it a sequence of key: value pairs, or a map or an +array etc. On the other hand it might be that it is best as it is where +you just read the code to see. + +> + void *local = talloc_new (NULL); +> notmuch_tags_t *tags; +> - int first = 1; +> - void *ctx_quote = talloc_new (ctx); +> time_t date; +> const char *relative_date; +> +> date = notmuch_message_get_date (message); +> - relative_date = notmuch_time_relative_date (ctx, date); +> + relative_date = notmuch_time_relative_date (local, date); + +This makes the diff very easy to read but it might be nicer to have +these two assignments further down where they are used. + +Best wishes + +Mark + +> + +> + sp->map_key (sp, "id"); +> + sp->string (sp, notmuch_message_get_message_id (message)); +> + +> + sp->map_key (sp, "match"); +> + sp->boolean (sp, notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH)); +> + +> + sp->map_key (sp, "excluded"); +> + sp->boolean (sp, notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED)); +> + +> + sp->map_key (sp, "filename"); +> + sp->string (sp, notmuch_message_get_filename (message)); +> + +> + sp->map_key (sp, "timestamp"); +> + date = notmuch_message_get_date (message); +> + sp->integer (sp, date); +> +> - printf ("\"id\": %s, \"match\": %s, \"excluded\": %s, \"filename\": %s, \"timestamp\": %ld, \"date_relative\": \"%s\", \"tags\": [", +> - json_quote_str (ctx_quote, notmuch_message_get_message_id (message)), +> - notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH) ? "true" : "false", +> - notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED) ? "true" : "false", +> - json_quote_str (ctx_quote, notmuch_message_get_filename (message)), +> - date, relative_date); +> + sp->map_key (sp, "date_relative"); +> + sp->string (sp, relative_date); +> +> + sp->map_key (sp, "tags"); +> + sp->begin_list (sp); +> for (tags = notmuch_message_get_tags (message); +> notmuch_tags_valid (tags); +> notmuch_tags_move_to_next (tags)) +> - { +> - printf("%s%s", first ? "" : ",", +> - json_quote_str (ctx_quote, notmuch_tags_get (tags))); +> - first = 0; +> - } +> - printf("], "); +> - talloc_free (ctx_quote); +> + sp->string (sp, notmuch_tags_get (tags)); +> + sp->end (sp); +> + +> + talloc_free (local); +> } +> +> /* Extract just the email address from the contents of a From: +> @@ -573,18 +583,19 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node, +> * devel/schemata. */ +> +> if (node->envelope_file) { +> - printf ("{"); +> - format_message_json (ctx, node->envelope_file); +> + sp->begin_map (sp); +> + format_message_json (sp, node->envelope_file); +> +> - printf ("\"headers\": "); +> + sp->map_key (sp, "headers"); +> format_headers_json (sp, GMIME_MESSAGE (node->part), FALSE); +> +> if (output_body) { +> - printf (", \"body\": ["); +> + sp->map_key (sp, "body"); +> + sp->begin_list (sp); +> format_part_json (ctx, sp, mime_node_child (node, 0), first, TRUE); +> - printf ("]"); +> + sp->end (sp); +> } +> - printf ("}"); +> + sp->end (sp); +> return; +> } +> +> -- +> 1.7.10 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch