From 123f84ba52c2c3a8f4e766993f1e4929e8c52966 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Mon, 28 May 2012 20:06:38 +0100 Subject: [PATCH] Re: [PATCH v6 3/6] cli: make --entire-thread=false work for format=json. --- b1/fa5e8a43268aa71887afec1165c63c4c09d12d | 122 ++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 b1/fa5e8a43268aa71887afec1165c63c4c09d12d diff --git a/b1/fa5e8a43268aa71887afec1165c63c4c09d12d b/b1/fa5e8a43268aa71887afec1165c63c4c09d12d new file mode 100644 index 000000000..70d70d7ff --- /dev/null +++ b/b1/fa5e8a43268aa71887afec1165c63c4c09d12d @@ -0,0 +1,122 @@ +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 468C3431FAF + for ; Mon, 28 May 2012 12:06:40 -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 MfDP6x8JqjrI for ; + Mon, 28 May 2012 12:06:38 -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 69024431FAE + for ; Mon, 28 May 2012 12:06:38 -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 1SZ5H2-0005A5-VV; Mon, 28 May 2012 20:06:37 +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 1SZ5H2-00050D-Lx; Mon, 28 May 2012 20:06:36 +0100 +From: Mark Walters +To: Peter Wang , notmuch@notmuchmail.org +Subject: Re: [PATCH v6 3/6] cli: make --entire-thread=false work for + format=json. +In-Reply-To: <20120528233415.GE2331@hili.localdomain> +References: <1338106946-7611-1-git-send-email-markwalters1009@gmail.com> + <1338106946-7611-4-git-send-email-markwalters1009@gmail.com> + <20120528233415.GE2331@hili.localdomain> +User-Agent: Notmuch/0.13+55~g992aa73 (http://notmuchmail.org) Emacs/23.3.1 + (x86_64-pc-linux-gnu) +Date: Mon, 28 May 2012 20:06:38 +0100 +Message-ID: <87txz0m8g1.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: e2753ef8ca3839045240680d0416928c (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: Mon, 28 May 2012 19:06:40 -0000 + +On Mon, 28 May 2012, Peter Wang wrote: +> On Sun, 27 May 2012 09:22:23 +0100, Mark Walters wrote: +>> @@ -1036,7 +1047,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 (entire_thread == ENTIRE_THREAD_DEFAULT) +>> + entire_thread = ENTIRE_THREAD_TRUE; +>> break; +> +> Minor point, but you can defer this until later and keep the logic in +> one place. +> +>> case NOTMUCH_FORMAT_TEXT: +>> format = &format_text; +>> @@ -1058,6 +1071,15 @@ 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 (entire_thread == ENTIRE_THREAD_DEFAULT) +>> + entire_thread = ENTIRE_THREAD_FALSE; +>> + +>> + if (entire_thread == ENTIRE_THREAD_TRUE) +>> + params.entire_thread = TRUE; +>> + else +>> + params.entire_thread = FALSE; +> +> /* Default is entire-thread = FALSE except for format=json. */ +> if (entire_thread == ENTIRE_THREAD_DEFAULT) { +> if (format == &format_json) +> entire_thread = ENTIRE_THREAD_TRUE; +> else +> entire_thread = ENTIRE_THREAD_FALSE; +> } + +Yes I agree that this is cleaner. I will put it in the next version. + +Many thanks for the reviews! + +Mark -- 2.26.2