From: Mark Walters Date: Sat, 21 Apr 2012 09:15:49 +0000 (+0100) Subject: [PATCH v3 1/2] cli: make --entire-thread=false work for format=json. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e30b63fd1332db2f9f5d7dab6661dd23177e68a1;p=notmuch-archives.git [PATCH v3 1/2] cli: make --entire-thread=false work for format=json. --- diff --git a/41/860a8d589931e450c0e25998916cfffe3e9f47 b/41/860a8d589931e450c0e25998916cfffe3e9f47 new file mode 100644 index 000000000..616791abd --- /dev/null +++ b/41/860a8d589931e450c0e25998916cfffe3e9f47 @@ -0,0 +1,157 @@ +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 60EB1431FBC + for ; Sat, 21 Apr 2012 02:15:51 -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 H5-9Ih9dea3B for ; + Sat, 21 Apr 2012 02:15:50 -0700 (PDT) +Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com + [209.85.212.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id A9B58431FB6 + for ; Sat, 21 Apr 2012 02:15:50 -0700 (PDT) +Received: by wibhm17 with SMTP id hm17so1500624wib.2 + for ; Sat, 21 Apr 2012 02:15:49 -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=cMEMkQl84hgqEEbGER3D0fDqDiVeLs34d5ODtVbxQEg=; + b=H5LmwuR31VkR/1b2a4FW2nM0QMNI/DW5uvMFUJbBIPTWyweAnPiL89jFvfRnQe4TOy + XEoLWVj3AtpZhjxC7+OGVGU2a1CnU4Uun8IgYl3r3n/IbkxIwsX2I9M4YW8aVmcmhrOP + gzLQYUn2OfbQVlqqRzt60JOqSbsXr4Xt+YzQb0rLJm7eCH2evdVHwSYwGqQWdvPOZnY9 + BXT5OdFoTy1EOtS+e0NKOf/CGnwLG4L7iK7/3c42OSLnPSuHiSsjxkPFX0fW4LLwqEA1 + tky1VMB53DkWHaCq0iKzj6SFbdZu7391AVPeyUmzpnG7ta38eo0Cq0f2jWCcAer0z+xj + YhUw== +Received: by 10.216.133.93 with SMTP id p71mr5848232wei.10.1334999749293; + Sat, 21 Apr 2012 02:15:49 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + fz9sm4076829wib.3.2012.04.21.02.15.48 (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 21 Apr 2012 02:15:48 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v3 1/2] cli: make --entire-thread=false work for format=json. +Date: Sat, 21 Apr 2012 10:15:49 +0100 +Message-Id: <1334999750-21811-2-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1334999750-21811-1-git-send-email-markwalters1009@gmail.com> +References: <1334999750-21811-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, 21 Apr 2012 09:15:51 -0000 + +The --entire-thread option in notmuch-show.c defaults to true when +format=json. Previously there was no way to turn this off. This patch +makes it respect --entire-thread=false. + +The one subtlety is that we initialise a notmuch_bool_t to -1 to +indicate that the option parsing has not set it. This allows the code +to distinguish between the option being omitted from the command line, +and the option being set to false on the command line. + +Finally, all formats except Json can output empty messages for non +entire-thread, but in Json format we need to output {} to keep the +other elements (e.g. the replies to this message) in the correct +place. +--- + notmuch-show.c | 34 +++++++++++++++++++++++++++++----- + 1 files changed, 29 insertions(+), 5 deletions(-) + +diff --git a/notmuch-show.c b/notmuch-show.c +index da4a797..327c263 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -800,6 +800,16 @@ format_part_raw (unused (const void *ctx), mime_node_t *node, + } + + static notmuch_status_t ++show_null_message (const notmuch_show_format_t *format) ++{ ++ /* For all formats except json an empty message output is valid; ++ * for json we need the braces.*/ ++ if (format == &format_json) ++ printf ("{}"); ++ 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), +@@ -984,7 +996,13 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + char *query_string; + int opt_index, ret; + const notmuch_show_format_t *format = &format_text; +- notmuch_show_params_t params = { .part = -1, .omit_excluded = TRUE }; ++ ++ /* We abuse the notmuch_bool_t variable params.entire-thread by ++ * setting it to -1 to denote that the command line parsing has ++ * not set it. We ensure it is set to TRUE or FALSE before passing ++ * it to any other function.*/ ++ notmuch_show_params_t params = { .part = -1, .entire_thread = -1 }; ++ + int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED; + notmuch_bool_t verify = FALSE; + int exclude = EXCLUDE_TRUE; +@@ -1024,7 +1042,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + switch (format_sel) { + case NOTMUCH_FORMAT_JSON: + format = &format_json; +- params.entire_thread = TRUE; ++ /* JSON defaults to entire-thread TRUE */ ++ if (params.entire_thread == -1) ++ params.entire_thread = TRUE; + break; + case NOTMUCH_FORMAT_TEXT: + format = &format_text; +@@ -1046,6 +1066,10 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + params.raw = TRUE; + break; + } ++ /* Default is entire-thread = FALSE except for format=json which ++ * is dealt with above. */ ++ if (params.entire_thread == -1) ++ params.entire_thread = FALSE; + + if (params.decrypt || verify) { + #ifdef GMIME_ATLEAST_26 +-- +1.7.9.1 +