From 20b08886f4db30e038aa1a57750a8cf149632f75 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Fri, 30 Nov 2012 20:04:34 +0200 Subject: [PATCH] Re: [PATCH 2/3] Use the S-Expression structured printer for notmuch search. --- c5/bc19a7731a829c1ca797e59aaaacf1bbd55117 | 134 ++++++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 c5/bc19a7731a829c1ca797e59aaaacf1bbd55117 diff --git a/c5/bc19a7731a829c1ca797e59aaaacf1bbd55117 b/c5/bc19a7731a829c1ca797e59aaaacf1bbd55117 new file mode 100644 index 000000000..6fc64e84e --- /dev/null +++ b/c5/bc19a7731a829c1ca797e59aaaacf1bbd55117 @@ -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 75ADE431FBC + for ; Fri, 30 Nov 2012 10:04:43 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[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 EvZCYwooa7gn for ; + Fri, 30 Nov 2012 10:04:39 -0800 (PST) +Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com + [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 39103431FAF + for ; Fri, 30 Nov 2012 10:04:39 -0800 (PST) +Received: by mail-lb0-f181.google.com with SMTP id ge1so740710lbb.26 + for ; Fri, 30 Nov 2012 10:04:37 -0800 (PST) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=from:to:subject:in-reply-to:references:user-agent:date:message-id + :mime-version:content-type:x-gm-message-state; + bh=wW5Cd3bHNBIq8EXj2k75xus21IBHYtxFHmjU9nmJ6RE=; + b=n+EMKi4s6xCswIjQIbU+olqtLZmnIQ/6I164WfccLZ12V86HFWhcWSn5+5clHSS2g3 + xIAh6nvn6tBr0vDAe9e9K9MJpa+K9P/68rt8GfA8xalZLPcK6Hg0Wdr8jxoxMmu7iU7v + aT2aa/1Q8MKGPuUW3RGFjyAeYJmXe3W2M9q6jUuiWUL31Nn3OT0ceHE2qh2F1FQ6acmL + YsFdGw6sA4INxlPqBHK+e2ndSxjBkwGfwX3xa3nniJm5FuMXkEdgYB5UWcb5uArEOqzO + aXagzPRWnLVDxvf7HZ4QmUG0PDMFz9YOeQjBJ0+8gEUAAiqmCcMJk9+rVfT5KyOPO8tf + h1aQ== +Received: by 10.112.24.170 with SMTP id v10mr1156462lbf.88.1354298677630; + Fri, 30 Nov 2012 10:04:37 -0800 (PST) +Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi. + [80.223.81.27]) + by mx.google.com with ESMTPS id pw17sm2255462lab.5.2012.11.30.10.04.35 + (version=SSLv3 cipher=OTHER); Fri, 30 Nov 2012 10:04:36 -0800 (PST) +From: Jani Nikula +To: Peter Feigl , notmuch@notmuchmail.org +Subject: Re: [PATCH 2/3] Use the S-Expression structured printer for notmuch + search. +In-Reply-To: <1354264143-30173-2-git-send-email-craven@gmx.net> +References: <1354264143-30173-1-git-send-email-craven@gmx.net> + <1354264143-30173-2-git-send-email-craven@gmx.net> +User-Agent: Notmuch/0.14+124~g3b17402 (http://notmuchmail.org) Emacs/23.4.1 + (i686-pc-linux-gnu) +Date: Fri, 30 Nov 2012 20:04:34 +0200 +Message-ID: <87624nj7bh.fsf@nikula.org> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Gm-Message-State: + ALoCoQlQPLdQtDeMYgWURUEWHfDbuTXkuFks3OzOFzZZkuDz+FYxQ4PbbFB6CEXTFFyWIOiBjU1J +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: Fri, 30 Nov 2012 18:04:43 -0000 + +On Fri, 30 Nov 2012, Peter Feigl wrote: +> This commit adds support for --format=sexp to notmuch search. +> --- +> notmuch-search.c | 6 +++++- +> sprinter.h | 4 ++++ +> 2 files changed, 9 insertions(+), 1 deletion(-) +> +> diff --git a/notmuch-search.c b/notmuch-search.c +> index 830c4e4..6218622 100644 +> --- a/notmuch-search.c +> +++ b/notmuch-search.c +> @@ -305,7 +305,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) +> int exclude = EXCLUDE_TRUE; +> unsigned int i; +> +> - enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT } +> + enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT, NOTMUCH_FORMAT_SEXP } +> format_sel = NOTMUCH_FORMAT_TEXT; +> +> notmuch_opt_desc_t options[] = { +> @@ -315,6 +315,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) +> { 0, 0 } } }, +> { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f', +> (notmuch_keyword_t []){ { "json", NOTMUCH_FORMAT_JSON }, +> + { "sexp", NOTMUCH_FORMAT_SEXP }, +> { "text", NOTMUCH_FORMAT_TEXT }, +> { 0, 0 } } }, +> { NOTMUCH_OPT_KEYWORD, &output, "output", 'o', +> @@ -347,6 +348,9 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) +> case NOTMUCH_FORMAT_JSON: +> format = sprinter_json_create (ctx, stdout); +> break; +> + case NOTMUCH_FORMAT_SEXP: +> + format = sprinter_sexp_create (ctx, stdout); +> + break; +> default: +> /* this should never happen */ +> INTERNAL_ERROR("no output format selected"); +> diff --git a/sprinter.h b/sprinter.h +> index 912a526..59776a9 100644 +> --- a/sprinter.h +> +++ b/sprinter.h +> @@ -70,4 +70,8 @@ sprinter_text_create (const void *ctx, FILE *stream); +> struct sprinter * +> sprinter_json_create (const void *ctx, FILE *stream); +> +> +/* Create a new structure printer that emits S-Expressions. */ +> +struct sprinter * +> +sprinter_sexp_create (const void *ctx, FILE *stream); +> + + +This hunk belongs to patch 1/3. Otherwise LGTM. + +BR, +Jani. + + +> #endif // NOTMUCH_SPRINTER_H +> -- +> 1.8.0 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2