From 9ac138b6672494d3c7bc3f2a00390478b0719487 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Wed, 4 Jul 2012 09:41:56 +0100 Subject: [PATCH] Re: [PATCH 4/8] emacs: Helper for reporting search parsing errors --- bf/f54bb4961127d9978c2928a97044de6f79e5b8 | 127 ++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 bf/f54bb4961127d9978c2928a97044de6f79e5b8 diff --git a/bf/f54bb4961127d9978c2928a97044de6f79e5b8 b/bf/f54bb4961127d9978c2928a97044de6f79e5b8 new file mode 100644 index 000000000..70a18d37c --- /dev/null +++ b/bf/f54bb4961127d9978c2928a97044de6f79e5b8 @@ -0,0 +1,127 @@ +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 72581431FBD + for ; Wed, 4 Jul 2012 01:42:02 -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 Cefhl3FB3QRg for ; + Wed, 4 Jul 2012 01:42:02 -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 AB3FD431FB6 + for ; Wed, 4 Jul 2012 01:42:01 -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 1SmL9s-0007XZ-1i; Wed, 04 Jul 2012 09:42:00 +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 1SmL9r-0003I1-PH; Wed, 04 Jul 2012 09:41:59 +0100 +From: Mark Walters +To: Austin Clements , notmuch@notmuchmail.org +Subject: Re: [PATCH 4/8] emacs: Helper for reporting search parsing errors +In-Reply-To: <1341354059-29396-5-git-send-email-amdragon@mit.edu> +References: <1341354059-29396-1-git-send-email-amdragon@mit.edu> + <1341354059-29396-5-git-send-email-amdragon@mit.edu> +User-Agent: Notmuch/0.13.2+70~gb6a56e7 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Wed, 04 Jul 2012 09:41:56 +0100 +Message-ID: <87ehorhq97.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: 63fbf2399b833a59425a4ac623a80674 (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 +Cc: tomi.ollila@iki.fi +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: Wed, 04 Jul 2012 08:42:02 -0000 + +On Tue, 03 Jul 2012, Austin Clements wrote: +> This removes the last bit of direct output from the parsing function. +> With the parser now responsible solely for parsing, we can swap it out +> for another parser. +> --- +> emacs/notmuch.el | 10 +++++++++- +> 1 file changed, 9 insertions(+), 1 deletion(-) +> +> diff --git a/emacs/notmuch.el b/emacs/notmuch.el +> index 4a6490a..a073367 100644 +> --- a/emacs/notmuch.el +> +++ b/emacs/notmuch.el +> @@ -745,6 +745,13 @@ non-authors is found, assume that all of the authors match." +> (setq notmuch-search-target-thread "found") +> (goto-char beg))))) +> +> +(defun notmuch-search-show-error (string &rest objects) +> + (save-excursion +> + (goto-char (point-max)) +> + (insert "Error: Unexpected output from notmuch search:\n") +> + (insert (apply #'format string objects)) +> + (insert "\n"))) +> + +> (defun notmuch-search-process-filter (proc string) +> "Process and filter the output of \"notmuch search\"" +> (let ((buffer (process-buffer proc))) +> @@ -767,7 +774,8 @@ non-authors is found, assume that all of the authors match." +> (tags (match-string 6 string)) +> (tag-list (if tags (save-match-data (split-string tags))))) +> (if (/= (match-beginning 1) line) +> - (insert (concat "Error: Unexpected output from notmuch search:\n" (substring string line (match-beginning 1)) "\n"))) +> + (notmuch-search-show-error +> + (substring string line (match-beginning 1)))) +> (notmuch-search-show-result thread-id date count authors subject tag-list) +> (set 'line (match-end 0))) +> (set 'more nil) + +Ok so I should have read this patch before replying to the previous +one. This fixes my one trivial concern with Patch 3 and looks good in +itself. + +I have read Patches 1-4 and they all look fine and make things cleaner +and all tests pass. As Austin says, they stand on their own and can go +in without the rest of the series. + +On to patches 5-8! + +Best wishes + +Mark -- 2.26.2