--- /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 2DA56431FC7\r
+ for <notmuch@notmuchmail.org>; Sat, 1 Dec 2012 18:40:15 -0800 (PST)\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 s3cBDBYoXoUA for <notmuch@notmuchmail.org>;\r
+ Sat, 1 Dec 2012 18:40:14 -0800 (PST)\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 84BFB431FBD\r
+ for <notmuch@notmuchmail.org>; Sat, 1 Dec 2012 18:40:13 -0800 (PST)\r
+X-AuditID: 1209190f-b7fec6d00000090d-86-50babf8c3c95\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 5F.F5.02317.C8FBAB05; Sat, 1 Dec 2012 21:40:12 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id qB22eBs1013710; \r
+ Sat, 1 Dec 2012 21:40:11 -0500\r
+Received: from drake.dyndns.org\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qB22e6tc025604\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 1 Dec 2012 21:40:10 -0500 (EST)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1TezTS-0000xk-3Y; Sat, 01 Dec 2012 21:40:06 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 08/10] emacs: Factor out synchronous notmuch JSON invocations\r
+Date: Sat, 1 Dec 2012 21:40:00 -0500\r
+Message-Id: <1354416002-3557-8-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1354416002-3557-1-git-send-email-amdragon@mit.edu>\r
+References: <1354416002-3557-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixCmqrNuzf1eAwf038hbXb85kdmD0eLbq\r
+ FnMAYxSXTUpqTmZZapG+XQJXxquL7YwFz8UrVjfeYW9gnC/cxcjBISFgInGpLbWLkRPIFJO4\r
+ cG89WxcjF4eQwD5GiY+NT6Cc9YwSL5+dY4FwHjJJ9B1dAuXMZZRo29/BCtLPJqAhsW3/ckYQ\r
+ W0RAWmLn3dmsICuYBdQk/nSpgISFBXwllt48xgRiswioSvw9vY0dxOYVsJeY+ABkNcgZihLd\r
+ zyawgbRyCjhIrOjmAQkLAZX8/32NbQIj/wJGhlWMsim5Vbq5iZk5xanJusXJiXl5qUW6Jnq5\r
+ mSV6qSmlmxjBISPJv4Px20GlQ4wCHIxKPLyMs3YFCLEmlhVX5h5ilORgUhLlvbIDKMSXlJ9S\r
+ mZFYnBFfVJqTWnyIUYKDWUmEl8UEKMebklhZlVqUD5OS5mBREue9mnLTX0ggPbEkNTs1tSC1\r
+ CCYrw8GhJMFbvQ+oUbAoNT21Ii0zpwQhzcTBCTKcB2j4o70gw4sLEnOLM9Mh8qcYFaXEea+B\r
+ JARAEhmleXC9sJh+xSgO9IowryfICh5gOoDrfgU0mAlo8Jtl20EGlyQipKQaGLNPvb0uUsQ5\r
+ 85PQmtxrS57wNi3rtFuwUGL3nqu3Lixjtr1cfDR23b1tfoXSRh8jG7UWW+6JcTYyn2pedyd9\r
+ kebHY2wqUtX/zRpnX8/eqrWT+XKXvsEV4TPMHj1VO0949vpoySjYXe6Yf3575uSpKzXNPh0L\r
+ 3paYFhKjLybRUaGyKMBN4VdPoBJLcUaioRZzUXEiAMlW5JjEAgAA\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: Sun, 02 Dec 2012 02:40:15 -0000\r
+\r
+Previously this code was duplicated between show and reply. This\r
+factors out synchronously invoking notmuch and parsing the output as\r
+JSON.\r
+---\r
+ emacs/notmuch-lib.el | 14 ++++++++++++++\r
+ emacs/notmuch-mua.el | 8 +-------\r
+ emacs/notmuch-query.el | 11 ++---------\r
+ 3 files changed, 17 insertions(+), 16 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 49b0da6..31c69dc 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -357,6 +357,20 @@ You may need to restart Emacs or upgrade your notmuch package."))\r
+ (error "Bad exit status %d" exit-status)))\r
+ (error "notmuch CLI version mismatch"))\r
+ \r
++(defun notmuch-call-notmuch-json (&rest args)\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."\r
++\r
++ (with-temp-buffer\r
++ (apply #'call-process notmuch-command nil (list t nil) nil args)\r
++ (goto-char (point-min))\r
++ (let ((json-object-type 'plist)\r
++ (json-array-type 'list)\r
++ (json-false 'nil))\r
++ (json-read))))\r
++\r
+ ;; Compatibility functions for versions of emacs before emacs 23.\r
+ ;;\r
+ ;; Both functions here were copied from emacs 23 with the following copyright:\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 408b49e..ac2d29e 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -158,13 +158,7 @@ list."\r
+ (setq args (append args (list query-string)))\r
+ \r
+ ;; Get the reply object as JSON, and parse it into an elisp object.\r
+- (with-temp-buffer\r
+- (apply 'call-process (append (list notmuch-command nil (list t nil) nil) args))\r
+- (goto-char (point-min))\r
+- (let ((json-object-type 'plist)\r
+- (json-array-type 'list)\r
+- (json-false 'nil))\r
+- (setq reply (json-read))))\r
++ (setq reply (apply #'notmuch-call-notmuch-json args))\r
+ \r
+ ;; Extract the original message to simplify the following code.\r
+ (setq original (plist-get reply :original))\r
+diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el\r
+index d66baea..e7e3520 100644\r
+--- a/emacs/notmuch-query.el\r
++++ b/emacs/notmuch-query.el\r
+@@ -29,18 +29,11 @@ A thread is a forest or list of trees. A tree is a two element\r
+ list where the first element is a message, and the second element\r
+ is a possibly empty forest of replies.\r
+ "\r
+- (let ((args '("show" "--format=json"))\r
+- (json-object-type 'plist)\r
+- (json-array-type 'list)\r
+- (json-false 'nil))\r
++ (let ((args '("show" "--format=json")))\r
+ (if notmuch-show-process-crypto\r
+ (setq args (append args '("--decrypt"))))\r
+ (setq args (append args search-terms))\r
+- (with-temp-buffer\r
+- (progn\r
+- (apply 'call-process (append (list notmuch-command nil (list t nil) nil) args))\r
+- (goto-char (point-min))\r
+- (json-read)))))\r
++ (apply #'notmuch-call-notmuch-json args)))\r
+ \r
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\r
+ ;; Mapping functions across collections of messages.\r
+-- \r
+1.7.10.4\r
+\r
projects / notmuch-archives.git / commitdiff