From: Mark Walters Date: Tue, 24 Apr 2012 09:11:12 +0000 (+0100) Subject: [PATCH v4 1/4] cli: Let json output "null" messages for non --entire-thread X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=fdf1dddf4cfe7626c749d1178d2acf4d26e096fe;p=notmuch-archives.git [PATCH v4 1/4] cli: Let json output "null" messages for non --entire-thread --- diff --git a/9b/a5fbe03d70c7760e1120d46eddb6227ed11d9a b/9b/a5fbe03d70c7760e1120d46eddb6227ed11d9a new file mode 100644 index 000000000..abb7c0bf9 --- /dev/null +++ b/9b/a5fbe03d70c7760e1120d46eddb6227ed11d9a @@ -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 190E7431FAF + for ; Tue, 24 Apr 2012 02:11:08 -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 q58ZoLizZFu2 for ; + Tue, 24 Apr 2012 02:11:07 -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 700DF431FAE + for ; Tue, 24 Apr 2012 02:11:07 -0700 (PDT) +Received: by mail-we0-f181.google.com with SMTP id m13so629233wer.26 + for ; Tue, 24 Apr 2012 02:11: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=LjamFB/rJQDQtV8uCKBMJ2GIcfiJI5Sr7hM6TIBcLpM=; + b=M81vKp5RVP6iELK6ZNGH97OUzN4TMWIcFUJP7Jo4rRTlxHbcceGHIOsu+yK7cAF8FF + yDLOkunNPGYpQhcKd9kndh2tpG1w3ZB0eIDYuFB8Vrre/CY9PqXhbByCfB5Mvto2nip2 + voKhTnhV1O8KbRVIR/TGMvnL9ZatHG6yA5xbfiU0oheX0jMdAsiK0o89BbhJ1/aPSBLZ + rfkjMaT33P3FsSbTfmFjulDRLLNQXL+ZqOAfsVm12YwJ5H/U83MNX0vGxQxJ1acWPnMc + EGHf99vXmkkkVuftSwEn8+jvJb/EArDL/6Vl3GBpyx38PRX9kC081vkIHGHID2qH+8xP + cb1Q== +Received: by 10.180.97.41 with SMTP id dx9mr10686844wib.9.1335258666240; + Tue, 24 Apr 2012 02:11:06 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + b3sm28695122wib.4.2012.04.24.02.11.04 (version=TLSv1/SSLv3 cipher=OTHER); + Tue, 24 Apr 2012 02:11:05 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v4 1/4] cli: Let json output "null" messages for non + --entire-thread +Date: Tue, 24 Apr 2012 10:11:12 +0100 +Message-Id: <1335258675-29439-2-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1335258675-29439-1-git-send-email-markwalters1009@gmail.com> +References: <1335258675-29439-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: Tue, 24 Apr 2012 09:11:08 -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 da4a797..0d21f1a 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 +