From 6322eeb1023fa07c0f391970855179b301e49504 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 8 Dec 2012 08:48:26 +0000 Subject: [PATCH] Re: [PATCH 07/10] emacs: Use --use-schema for search --- 1b/45a77cc0983238cf26532440280a990b0cb100 | 198 ++++++++++++++++++++++ 1 file changed, 198 insertions(+) create mode 100644 1b/45a77cc0983238cf26532440280a990b0cb100 diff --git a/1b/45a77cc0983238cf26532440280a990b0cb100 b/1b/45a77cc0983238cf26532440280a990b0cb100 new file mode 100644 index 000000000..f8739c7bd --- /dev/null +++ b/1b/45a77cc0983238cf26532440280a990b0cb100 @@ -0,0 +1,198 @@ +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 9F619431FAF + for ; Sat, 8 Dec 2012 00:48:26 -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 OJpy3cTkUwP2 for ; + Sat, 8 Dec 2012 00:48:24 -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 0BB5E431FAE + for ; Sat, 8 Dec 2012 00:48:24 -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 1ThG58-00069c-5s; Sat, 08 Dec 2012 08:48:22 +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 1ThG57-0004FC-Os; Sat, 08 Dec 2012 08:48:22 +0000 +From: Mark Walters +To: Austin Clements , notmuch@notmuchmail.org +Subject: Re: [PATCH 07/10] emacs: Use --use-schema for search +In-Reply-To: <1354416002-3557-7-git-send-email-amdragon@mit.edu> +References: <1354416002-3557-1-git-send-email-amdragon@mit.edu> + <1354416002-3557-7-git-send-email-amdragon@mit.edu> +User-Agent: Notmuch/0.14+81~g9730584 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Sat, 08 Dec 2012 08:48:26 +0000 +Message-ID: <87ehj1gc9x.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: 855dd0488c8187b0d0b2eda6089e4b62 (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: Sat, 08 Dec 2012 08:48:26 -0000 + +On Sun, 02 Dec 2012, Austin Clements wrote: +> We detect the special exit statuses and use these to produce specific +> diagnostic messages. +> --- +> emacs/notmuch-lib.el | 32 ++++++++++++++++++++++++++++++++ +> emacs/notmuch.el | 17 +++++++++++++---- +> 2 files changed, 45 insertions(+), 4 deletions(-) +> +> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el +> index 9402456..49b0da6 100644 +> --- a/emacs/notmuch-lib.el +> +++ b/emacs/notmuch-lib.el +> @@ -325,6 +325,38 @@ string), a property list of face attributes, or a list of these." +> (put-text-property pos next 'face (cons face cur)) +> (setq pos next))))) +> +> +(defun notmuch-pop-up-error (msg) +> + "Pop up an error buffer displaying MSG." +> + +> + (let ((buf (get-buffer-create "*Notmuch errors*"))) +> + (with-current-buffer buf +> + (view-mode) +> + (let ((inhibit-read-only t)) +> + (erase-buffer) +> + (insert msg) +> + (unless (bolp) +> + (insert "\n")) +> + (goto-char (point-min)))) +> + (pop-to-buffer buf))) + +I am not sure about the erase-buffer in the above: do we definitely want +to remove all previous error information? For version mismatch possibly +we do but in patch 9 it is done for all show command-line error returns. +Incidentally why does show always pop-up an error but search only for +version-mismatches? + +Otherwise this looks good to me (but I am not that familiar with lisp +error handling) + +Best wishes + +Mark + + + + + + +> +(defun notmuch-version-mismatch-error (exit-status) +> + "Signal a schema version mismatch error. +> + +> +EXIT-STATUS must be the exit status of the notmuch CLI command, +> +and must have the value 20 or 21. This function will pop up an +> +error buffer with a descriptive message and signal an error." +> + (cond ((= exit-status 20) +> + (notmuch-pop-up-error "Error: Version mismatch. +> +Emacs requested an older output format than supported by the notmuch CLI. +> +You may need to restart Emacs or upgrade your notmuch Emacs package.")) +> + ((= exit-status 21) +> + (notmuch-pop-up-error "Error: Version mismatch. +> +Emacs requested a newer output format than supported by the notmuch CLI. +> +You may need to restart Emacs or upgrade your notmuch package.")) +> + (t +> + (error "Bad exit status %d" exit-status))) +> + (error "notmuch CLI version mismatch")) +> + +> ;; Compatibility functions for versions of emacs before emacs 23. +> ;; +> ;; Both functions here were copied from emacs 23 with the following copyright: +> diff --git a/emacs/notmuch.el b/emacs/notmuch.el +> index f9454d8..e1f28ca 100644 +> --- a/emacs/notmuch.el +> +++ b/emacs/notmuch.el +> @@ -644,6 +644,7 @@ of the result." +> (exit-status (process-exit-status proc)) +> (never-found-target-thread nil)) +> (when (memq status '(exit signal)) +> + (catch 'return +> (kill-buffer (process-get proc 'parse-buf)) +> (if (buffer-live-p buffer) +> (with-current-buffer buffer +> @@ -655,8 +656,16 @@ of the result." +> (insert "Incomplete search results (search process was killed).\n")) +> (when (eq status 'exit) +> (insert "End of search results.") +> - (unless (= exit-status 0) +> - (insert (format " (process returned %d)" exit-status))) +> + (cond ((or (= exit-status 20) (= exit-status 21)) +> + (kill-buffer) +> + (condition-case err +> + (notmuch-version-mismatch-error exit-status) +> + ;; Strange things happen when you signal +> + ;; an error from a sentinel. +> + (error (throw 'return nil)))) +> + ((/= exit-status 0) +> + (insert (format " (process returned %d)" +> + exit-status)))) +> (insert "\n") +> (if (and atbob +> (not (string= notmuch-search-target-thread "found"))) +> @@ -664,7 +673,7 @@ of the result." +> (when (and never-found-target-thread +> notmuch-search-target-line) +> (goto-char (point-min)) +> - (forward-line (1- notmuch-search-target-line)))))))) +> + (forward-line (1- notmuch-search-target-line))))))))) +> +> (defcustom notmuch-search-line-faces '(("unread" :weight bold) +> ("flagged" :foreground "blue")) +> @@ -938,7 +947,7 @@ Other optional parameters are used as follows: +> (let ((proc (start-process +> "notmuch-search" buffer +> notmuch-command "search" +> - "--format=json" +> + "--format=json" "--use-schema=1" +> (if oldest-first +> "--sort=oldest-first" +> "--sort=newest-first") +> -- +> 1.7.10.4 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2