--- /dev/null
+Return-Path: <amdragon@mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 151A3431FC4\r
+ for <notmuch@notmuchmail.org>; Thu, 30 May 2013 10:13:53 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id kT+ZeLWPDeAD for <notmuch@notmuchmail.org>;\r
+ Thu, 30 May 2013 10:13:45 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (dmz-mailsec-scanner-4.mit.edu\r
+ [18.9.25.15])\r
+ by olra.theworths.org (Postfix) with ESMTP id E4685431FBC\r
+ for <notmuch@notmuchmail.org>; Thu, 30 May 2013 10:13:44 -0700 (PDT)\r
+X-AuditID: 1209190f-b7f256d000005616-ac-51a788c80362\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+ by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 8D.C2.22038.8C887A15; Thu, 30 May 2013 13:13:44 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+ by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id r4UHDgQf027511; \r
+ Thu, 30 May 2013 13:13:43 -0400\r
+Received: from drake.dyndns.org (c-76-21-105-205.hsd1.ca.comcast.net\r
+ [76.21.105.205]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r4UHDcnX009862\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Thu, 30 May 2013 13:13:41 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1Ui6Py-0005r2-8V; Thu, 30 May 2013 13:13:38 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 2/5] emacs: Utilities to manage asynchronous notmuch\r
+ processes\r
+Date: Thu, 30 May 2013 13:13:33 -0400\r
+Message-Id: <1369934016-22308-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1369934016-22308-1-git-send-email-amdragon@mit.edu>\r
+References: <1369934016-22308-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrGIsWRmVeSWpSXmKPExsUixCmqrHuiY3mgwa7J0har5/JYXL85k9ni\r
+ zcp5rA7MHjtn3WX3OPx1IYvHs1W3mAOYo7hsUlJzMstSi/TtErgyHq0wL/ijVTHv0i/WBsb1\r
+ Sl2MnBwSAiYS3W032CBsMYkL99YD2VwcQgL7GCUezHnIAuFsZJR4vKeDFcI5zSQxY/9XZghn\r
+ LqPEn4WrGEH62QQ0JLbtXw5miwhIS+y8O5sVxGYWiJPYMuU/WFxYIFDi7IvJ7CA2i4CqxIbV\r
+ d1lAbF4BB4lVd1ezQNyhKNH9bALYTZwCjhI7Jp8GmyMEVHNp71emCYz8CxgZVjHKpuRW6eYm\r
+ ZuYUpybrFicn5uWlFuma6OVmluilppRuYgQHlyT/DsZvB5UOMQpwMCrx8GYkLQ8UYk0sK67M\r
+ PcQoycGkJMq7vhUoxJeUn1KZkVicEV9UmpNafIhRgoNZSYS3wBkox5uSWFmVWpQPk5LmYFES\r
+ 572actNfSCA9sSQ1OzW1ILUIJivDwaEkwXu9HahRsCg1PbUiLTOnBCHNxMEJMpwHaPgFkBre\r
+ 4oLE3OLMdIj8KUZFKXHe+yAJAZBERmkeXC8s+l8xigO9Isz7CKSKB5g44LpfAQ1mAhr8xBps\r
+ cEkiQkqqgXE+24Uzd+Qnm4snfmhjndPH9nvZ0aOmRtKuf/t5Coo4wk2Ymcv2WsbseKyo9Ugr\r
+ TYHphOvVqt2iC7d6em+84PF5zs5/7CtYawQ412/d+Vr7w4a2kr0hPgeqtv3bWW7f2/qV+2Py\r
+ 6xNV13winx1IXBDVdoPnM0edr5ofqxLbR8fIrb/84w//OqLEUpyRaKjFXFScCAA6kvJK2QIA AA==\r
+Cc: tomi.ollila@iki.fi\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 30 May 2013 17:13:53 -0000\r
+\r
+This provides a new notmuch-lib utility to start an asynchronous\r
+notmuch process that handles redirecting of stderr and checking of the\r
+exit status. This is similar to `notmuch-call-notmuch-json', but for\r
+asynchronous processes (and it leaves output processing to the\r
+caller).\r
+---\r
+ emacs/notmuch-lib.el | 77 +++++++++++++++++++++++++++++++++++++++++++++++---\r
+ 1 file changed, 73 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 59b1ce3..180f63d 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -383,18 +383,21 @@ signaled error. This function does not return."\r
+ (error "%s" (concat msg (when extra\r
+ " (see *Notmuch errors* for more details)"))))\r
+ \r
+-(defun notmuch-check-async-exit-status (proc msg)\r
++(defun notmuch-check-async-exit-status (proc msg &optional command err-file)\r
+ "If PROC exited abnormally, pop up an error buffer and signal an error.\r
+ \r
+ This is a wrapper around `notmuch-check-exit-status' for\r
+ asynchronous process sentinels. PROC and MSG must be the\r
+-arguments passed to the sentinel."\r
++arguments passed to the sentinel. COMMAND and ERR-FILE, if\r
++provided, are passed to `notmuch-check-exit-status'. If COMMAND\r
++is not provided, it is taken from `process-command'."\r
+ (let ((exit-status\r
+ (case (process-status proc)\r
+ ((exit) (process-exit-status proc))\r
+ ((signal) msg))))\r
+ (when exit-status\r
+- (notmuch-check-exit-status exit-status (process-command proc)))))\r
++ (notmuch-check-exit-status exit-status (or command (process-command proc))\r
++ nil err-file))))\r
+ \r
+ (defun notmuch-check-exit-status (exit-status command &optional output err-file)\r
+ "If EXIT-STATUS is non-zero, pop up an error buffer and signal an error.\r
+@@ -448,7 +451,7 @@ You may need to restart Emacs or upgrade your notmuch package."))\r
+ ))))\r
+ \r
+ (defun notmuch-call-notmuch-json (&rest args)\r
+- "Invoke `notmuch-command' with `args' and return the parsed JSON output.\r
++ "Invoke `notmuch-command' with ARGS and return the parsed JSON output.\r
+ \r
+ The returned output will represent objects using property lists\r
+ and arrays as lists. If notmuch exits with a non-zero status,\r
+@@ -469,6 +472,72 @@ an error."\r
+ (json-read)))\r
+ (delete-file err-file)))))\r
+ \r
++(defun notmuch-start-notmuch (name buffer sentinel &rest args)\r
++ "Start and return an asynchronous notmuch command.\r
++\r
++This starts and returns an asynchronous process running\r
++`notmuch-command' with ARGS. The exit status is checked via\r
++`notmuch-check-async-exit-status'. Output written to stderr is\r
++redirected and displayed when the process exits (even if the\r
++process exits successfully). NAME and BUFFER are the same as in\r
++`start-process'. SENTINEL is a process sentinel function to call\r
++when the process exits, or nil for none. The caller must *not*\r
++invoke `set-process-sentinel' directly on the returned process,\r
++as that will interfere with the handling of stderr and the exit\r
++status."\r
++\r
++ ;; There is no way (as of Emacs 24.3) to capture stdout and stderr\r
++ ;; separately for asynchronous processes, or even to redirect stderr\r
++ ;; to a file, so we use a trivial shell wrapper to send stderr to a\r
++ ;; temporary file and clean things up in the sentinel.\r
++ (let* ((err-file (make-temp-file "nmerr"))\r
++ ;; Use a pipe\r
++ (process-connection-type nil)\r
++ ;; Find notmuch using Emacs' `exec-path'\r
++ (command (or (executable-find notmuch-command)\r
++ (error "command not found: %s" notmuch-command)))\r
++ (proc (apply #'start-process name buffer\r
++ "sh" "-c"\r
++ "ERR=\"$1\"; shift; exec \"$0\" \"$@\" 2>\"$ERR\""\r
++ command err-file args)))\r
++ (process-put proc 'err-file err-file)\r
++ (process-put proc 'sub-sentinel sentinel)\r
++ (process-put proc 'real-command (cons notmuch-command args))\r
++ (set-process-sentinel proc #'notmuch-start-notmuch-sentinel)\r
++ proc))\r
++\r
++(defun notmuch-start-notmuch-sentinel (proc event)\r
++ (let ((err-file (process-get proc 'err-file))\r
++ (sub-sentinel (process-get proc 'sub-sentinel))\r
++ (real-command (process-get proc 'real-command)))\r
++ (condition-case err\r
++ (progn\r
++ ;; Invoke the sub-sentinel, if any\r
++ (when sub-sentinel\r
++ (funcall sub-sentinel proc event))\r
++ ;; Check the exit status. This will signal an error if the\r
++ ;; exit status is non-zero.\r
++ (notmuch-check-async-exit-status proc event real-command err-file)\r
++ ;; If that didn't signal an error, then any error output was\r
++ ;; really warning output. Show warnings, if any.\r
++ (let ((warnings\r
++ (with-temp-buffer\r
++ (unless (= (second (insert-file-contents err-file)) 0)\r
++ (end-of-line)\r
++ ;; Show first line; stuff remaining lines in the\r
++ ;; errors buffer.\r
++ (let ((l1 (buffer-substring (point-min) (point))))\r
++ (skip-chars-forward "\n")\r
++ (cons l1 (unless (eobp)\r
++ (buffer-substring (point) (point-max)))))))))\r
++ (when warnings\r
++ (notmuch-logged-error (car warnings) (cdr warnings)))))\r
++ (error\r
++ ;; Emacs behaves strangely if error an error escapes from a\r
++ ;; sentinel, so turns errors into messages.\r
++ (message "%s" (error-message-string err))))\r
++ (ignore-errors (delete-file err-file))))\r
++\r
+ ;; This variable is used only buffer local, but it needs to be\r
+ ;; declared globally first to avoid compiler warnings.\r
+ (defvar notmuch-show-process-crypto nil)\r
+-- \r
+1.7.10.4\r
+\r
projects / notmuch-archives.git / commitdiff