From 15eeb009b56ad9c995bbace1cb81d06b5ddedd02 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sun, 16 Dec 2012 21:13:08 +0000 Subject: [PATCH] Re: [PATCH v3 0/5] add --format=text0 to notmuch search --- 5c/06cf27e73c7c0128fdcdd5958a86a46e827840 | 189 ++++++++++++++++++++++ 1 file changed, 189 insertions(+) create mode 100644 5c/06cf27e73c7c0128fdcdd5958a86a46e827840 diff --git a/5c/06cf27e73c7c0128fdcdd5958a86a46e827840 b/5c/06cf27e73c7c0128fdcdd5958a86a46e827840 new file mode 100644 index 000000000..296bbf6cb --- /dev/null +++ b/5c/06cf27e73c7c0128fdcdd5958a86a46e827840 @@ -0,0 +1,189 @@ +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 C5EED431FB6 + for ; Sun, 16 Dec 2012 13:13:10 -0800 (PST) +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 3VVO-cwvzUlA for ; + Sun, 16 Dec 2012 13:13:08 -0800 (PST) +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 8B0CF431FAE + for ; Sun, 16 Dec 2012 13:13:08 -0800 (PST) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1TkLWD-0004UY-Kx; Sun, 16 Dec 2012 21:13:06 +0000 +Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) + (envelope-from ) + id 1TkLWD-0001Gi-5z; Sun, 16 Dec 2012 21:13:05 +0000 +From: Mark Walters +To: Jani Nikula , notmuch@notmuchmail.org +Subject: Re: [PATCH v3 0/5] add --format=text0 to notmuch search +In-Reply-To: +References: +User-Agent: Notmuch/0.14+226~ge56ae2a (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Sun, 16 Dec 2012 21:13:08 +0000 +Message-ID: <87d2y9em57.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 93.97.24.31 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: ebaf31bafb9a55eaf407f92678b36c43 (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.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: Sun, 16 Dec 2012 21:13:10 -0000 + +On Sun, 16 Dec 2012, Jani Nikula wrote: +> Hi all, v3 of id:cover.1355064714.git.jani@nikula.org +> +> Changes since v2: +> * add new patch 1/5 to clarify sprinter documentation +> * fix the test patch 4/5 according to id:8738z6wguj.fsf@qmul.ac.uk and +> id:87y5gyvvv7.fsf@awakening.csail.mit.edu +> +> Diff to v2 at the end of the cover letter. + +LGTM +1 + +Best wishes + +Mark + + + +> +> +> BR, +> Jani. +> +> +> Jani Nikula (5): +> sprinter: clarify separator documentation +> sprinter: add text0 formatter for null character separated text +> cli: add --format=text0 to notmuch search +> test: notmuch search --format=text0 +> man: document notmuch search --format=text0 +> +> man/man1/notmuch-search.1 | 26 ++++++++++++++++---------- +> notmuch-search.c | 16 ++++++++++++++-- +> sprinter-text.c | 22 ++++++++++++++++++++++ +> sprinter.h | 15 +++++++++++---- +> test/text | 33 +++++++++++++++++++++++++++++++++ +> 5 files changed, 96 insertions(+), 16 deletions(-) +> +> -- +> 1.7.10.4 +> +> +> +> diff --git a/sprinter.h b/sprinter.h +> index f36b999..f859672 100644 +> --- a/sprinter.h +> +++ b/sprinter.h +> @@ -42,10 +42,11 @@ typedef struct sprinter { +> */ +> void (*map_key) (struct sprinter *, const char *); +> +> - /* Insert a separator (usually extra whitespace) for improved +> - * readability without affecting the abstract syntax of the +> - * structure being printed. +> - * For JSON, this could simply be a line break. +> + /* Insert a separator (usually extra whitespace). For the text +> + * printers, this is a syntactic separator. For the structured +> + * printers, this is for improved readability without affecting +> + * the abstract syntax of the structure being printed. For JSON, +> + * this could simply be a line break. +> */ +> void (*separator) (struct sprinter *); +> +> diff --git a/test/text b/test/text +> index e003a66..b5ccefc 100755 +> --- a/test/text +> +++ b/test/text +> @@ -55,30 +55,34 @@ test_expect_equal "$output" \ +> add_email_corpus +> +> test_begin_subtest "Search message tags: text0" +> -cat < EXPECTED.$test_count +> +cat < EXPECTED +> attachment inbox signed unread +> EOF +> -notmuch search --format=text0 --output=tags '*' | xargs -0 | notmuch_search_sanitize > OUTPUT.$test_count +> -test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count +> +notmuch search --format=text0 --output=tags '*' | xargs -0 | notmuch_search_sanitize > OUTPUT +> +test_expect_equal_file EXPECTED OUTPUT +> +> +# Use tr(1) to convert --output=text0 to --output=text for +> +# comparison. Also translate newlines to spaces to fail with more +> +# noise if they are present as delimiters instead of null +> +# characters. This assumes there are no newlines in the data. +> test_begin_subtest "Compare text vs. text0 for threads" +> -notmuch search --format=text --output=threads '*' | notmuch_search_sanitize > EXPECTED.$test_count +> -notmuch search --format=text0 --output=threads '*' | xargs -0 -L1 | notmuch_search_sanitize > OUTPUT.$test_count +> -test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count +> +notmuch search --format=text --output=threads '*' | notmuch_search_sanitize > EXPECTED +> +notmuch search --format=text0 --output=threads '*' | tr "\n\0" " \n" | notmuch_search_sanitize > OUTPUT +> +test_expect_equal_file EXPECTED OUTPUT +> +> test_begin_subtest "Compare text vs. text0 for messages" +> -notmuch search --format=text --output=messages '*' | notmuch_search_sanitize > EXPECTED.$test_count +> -notmuch search --format=text0 --output=messages '*' | xargs -0 -L1 | notmuch_search_sanitize > OUTPUT.$test_count +> -test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count +> +notmuch search --format=text --output=messages '*' | notmuch_search_sanitize > EXPECTED +> +notmuch search --format=text0 --output=messages '*' | tr "\n\0" " \n" | notmuch_search_sanitize > OUTPUT +> +test_expect_equal_file EXPECTED OUTPUT +> +> test_begin_subtest "Compare text vs. text0 for files" +> -notmuch search --format=text --output=files '*' | notmuch_search_sanitize > EXPECTED.$test_count +> -notmuch search --format=text0 --output=files '*' | xargs -0 -L1 | notmuch_search_sanitize > OUTPUT.$test_count +> -test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count +> +notmuch search --format=text --output=files '*' | notmuch_search_sanitize > EXPECTED +> +notmuch search --format=text0 --output=files '*' | tr "\n\0" " \n" | notmuch_search_sanitize > OUTPUT +> +test_expect_equal_file EXPECTED OUTPUT +> +> test_begin_subtest "Compare text vs. text0 for tags" +> -notmuch search --format=text --output=tags '*' | notmuch_search_sanitize > EXPECTED.$test_count +> -notmuch search --format=text0 --output=tags '*' | xargs -0 -L1 | notmuch_search_sanitize > OUTPUT.$test_count +> -test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count +> +notmuch search --format=text --output=tags '*' | notmuch_search_sanitize > EXPECTED +> +notmuch search --format=text0 --output=tags '*' | tr "\n\0" " \n" | notmuch_search_sanitize > OUTPUT +> +test_expect_equal_file EXPECTED OUTPUT +> +> test_done -- 2.26.2