From: Mark Walters Date: Sat, 26 May 2012 15:54:51 +0000 (+0100) Subject: [PATCH v5 2/5] cli: Let json output "null" messages for non --entire-thread X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c8c64251de11f91715f61f5e9d7ad0c66c4dd88c;p=notmuch-archives.git [PATCH v5 2/5] cli: Let json output "null" messages for non --entire-thread --- diff --git a/b4/296bbbb2812f8196434cae34456535897fb056 b/b4/296bbbb2812f8196434cae34456535897fb056 new file mode 100644 index 000000000..703dab80d --- /dev/null +++ b/b4/296bbbb2812f8196434cae34456535897fb056 @@ -0,0 +1,134 @@ +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 39335429E26 + for ; Sat, 26 May 2012 08:55:17 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + 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 PLLT0aUZu1QY for ; + Sat, 26 May 2012 08:55:16 -0700 (PDT) +Received: from mail-we0-f181.google.com (mail-we0-f181.google.com + [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 076E1431FBC + for ; Sat, 26 May 2012 08:55:07 -0700 (PDT) +Received: by mail-we0-f181.google.com with SMTP id j55so1411304wer.26 + for ; Sat, 26 May 2012 08:55:07 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=mfd1W0o3Zq5XgbruG4RMp4PSq5smW6eg4We84NNSXOc=; + b=qzpmttOiwpFAJfbGznpYJtzFIfMwGo1UmihV6gU2FJnn5fHVXNbTWe694h1iMuiiqc + hGNW+pt2Y0a9hAyQOvhBxDG6fDiuimqcoKer19PBk/arPc5HUAngR/1n73fdyO0r39Y6 + 1k6WG7BoSLnDwiYayidjHgzA1Drw7CWx4w4os02zgGfMmgMgOXnx5K/dRFbODMvGjJ39 + SMFMwZbk9OuaF+bJ6sV+B76FxSl8NiVhYE0RicRjUh9T8wAs15CHEL9Bgv/tQymaB8tg + 9BXjn0NGYbqe4lPV1J1kT73Fl6XDC/lno8gL68YH3XSHFWpyG6/T6Cnkh7FVMZ6vYbIO + akyg== +Received: by 10.180.80.35 with SMTP id o3mr4227774wix.7.1338047707621; + Sat, 26 May 2012 08:55:07 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + fl2sm9297732wib.2.2012.05.26.08.55.06 (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 26 May 2012 08:55:07 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v5 2/5] cli: Let json output "null" messages for non + --entire-thread +Date: Sat, 26 May 2012 16:54:51 +0100 +Message-Id: <1338047694-32548-3-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1338047694-32548-1-git-send-email-markwalters1009@gmail.com> +References: <1338047694-32548-1-git-send-email-markwalters1009@gmail.com> +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: Sat, 26 May 2012 15:55:17 -0000 + +All formats except Json can output empty messages for non +entire-thread, but in Json format we output "null" to keep the other +elements (e.g. the replies to the omitted message) in the correct +place. +--- + notmuch-client.h | 1 + + notmuch-show.c | 20 ++++++++++++++++---- + 2 files changed, 17 insertions(+), 4 deletions(-) + +diff --git a/notmuch-client.h b/notmuch-client.h +index 19b7f01..08540a7 100644 +--- a/notmuch-client.h ++++ b/notmuch-client.h +@@ -72,6 +72,7 @@ typedef struct notmuch_show_format { + const struct notmuch_show_params *params); + const char *message_set_sep; + const char *message_set_end; ++ const char *null_message; + } notmuch_show_format_t; + + typedef struct notmuch_show_params { +diff --git a/notmuch-show.c b/notmuch-show.c +index 95427d4..97da5cc 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -37,7 +37,8 @@ static const notmuch_show_format_t format_json = { + .message_set_start = "[", + .part = format_part_json_entry, + .message_set_sep = ", ", +- .message_set_end = "]" ++ .message_set_end = "]", ++ .null_message = "null" + }; + + static notmuch_status_t +@@ -800,6 +801,15 @@ format_part_raw (unused (const void *ctx), mime_node_t *node, + } + + static notmuch_status_t ++show_null_message (const notmuch_show_format_t *format) ++{ ++ /* Output a null message. Currently empty for all formats except Json */ ++ if (format->null_message) ++ printf ("%s", format->null_message); ++ return NOTMUCH_STATUS_SUCCESS; ++} ++ ++static notmuch_status_t + show_message (void *ctx, + const notmuch_show_format_t *format, + notmuch_message_t *message, +@@ -862,11 +872,13 @@ show_messages (void *ctx, + if (status && !res) + res = status; + next_indent = indent + 1; +- +- if (!status && format->message_set_sep) +- fputs (format->message_set_sep, stdout); ++ } else { ++ status = show_null_message (format); + } + ++ if (!status && format->message_set_sep) ++ fputs (format->message_set_sep, stdout); ++ + status = show_messages (ctx, + format, + notmuch_message_get_replies (message), +-- +1.7.9.1 +