--- /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 4495F431FC9\r
+ for <notmuch@notmuchmail.org>; Fri, 17 May 2013 21:33:06 -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 wHUQMiUjQ-Qo for <notmuch@notmuchmail.org>;\r
+ Fri, 17 May 2013 21:33:00 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+ [18.7.68.37])\r
+ by olra.theworths.org (Postfix) with ESMTP id CC397429E2F\r
+ for <notmuch@notmuchmail.org>; Fri, 17 May 2013 21:32:24 -0700 (PDT)\r
+X-AuditID: 12074425-b7f986d00000082c-e9-519704581065\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+ by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id FE.89.02092.85407915; Sat, 18 May 2013 00:32:24 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH-1.MIT.EDU [18.9.28.11])\r
+ by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id r4I4WDPb009845; \r
+ Sat, 18 May 2013 00:32:13 -0400\r
+Received: from drake.dyndns.org\r
+ (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [216.15.114.40]) (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 r4I4WBMD018833\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 18 May 2013 00:32:12 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1UdYo1-0001Yw-JW; Sat, 18 May 2013 00:31:41 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/5] emacs: Utilities to manage asynchronous notmuch processes\r
+Date: Sat, 18 May 2013 00:31:09 -0400\r
+Message-Id: <1368851472-5382-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1368851472-5382-1-git-send-email-amdragon@mit.edu>\r
+References: <1368851472-5382-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixG6nrhvBMj3Q4M8XPovVc3ksrt+cyezA\r
+ 5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZby4cJOpYK1mxcttl5gaGCcqdjFyckgImEhM\r
+ n/+BEcIWk7hwbz0biC0ksI9RYsV24y5GLiB7I6PE3wmn2SCcO0wSHUves0M4cxklHh9bxg7S\r
+ wiagIbFt/3KwUSIC0hI7785mBbGZBRwlPu9fBDZWWMBP4tzhtWA1LAKqEn/+LgOL8wrYS/w4\r
+ 280KcYaiRPezCWBxTgEHicPzj0GdZC/RdeEm2wRG/gWMDKsYZVNyq3RzEzNzilOTdYuTE/Py\r
+ Uot0LfRyM0v0UlNKNzGCA8lFdQfjhENKhxgFOBiVeHhnOE8LFGJNLCuuzD3EKMnBpCTKa/IP\r
+ KMSXlJ9SmZFYnBFfVJqTWnyIUYKDWUmE93kxUI43JbGyKrUoHyYlzcGiJM57I+Wmv5BAemJJ\r
+ anZqakFqEUxWhoNDSYK3iHl6oJBgUWp6akVaZk4JQpqJgxNkOA/Q8HKQGt7igsTc4sx0iPwp\r
+ RkUpcd5ikIQASCKjNA+uFxbprxjFgV4R5p0EUsUDTBJw3a+ABjMBDWa9NhVkcEkiQkqqgVGb\r
+ 427wkn75uHePb3ZN49zFctL8yzqv7QLP+q5tt13FZ/jBhelF3cYqtsVeZTO43c6mCtt5a3h8\r
+ rd2i87FgiWLbcb9vjdofdL/OnjfzeAmPXc+DXcqXliqXLVvasuHexRk+N/SPNN+++PBygMPL\r
+ iMzDttNiZcVP7bQtmfP/6ZnJk2fd7F7kVvZWiaU4I9FQi7moOBEAG+GmBc8CAAA=\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: Sat, 18 May 2013 04:33:06 -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 | 73 +++++++++++++++++++++++++++++++++++++++++++++++---\r
+ 1 file changed, 69 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 59b1ce3..a543471 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,68 @@ 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
++ (proc (apply #'start-process name buffer\r
++ "sh" "-c"\r
++ "ERR=\"$1\"; shift; exec \"$0\" \"$@\" 2>\"$ERR\""\r
++ notmuch-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-unless-debug 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
++ ;; Don't signal an error from a sentinel\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