From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id E18D8431FC2 for ; Fri, 14 Dec 2012 21:15:30 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 JV1Ix6Siceg7 for ; Fri, 14 Dec 2012 21:15:30 -0800 (PST) Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU [18.9.25.14]) by olra.theworths.org (Postfix) with ESMTP id C119B431FC9 for ; Fri, 14 Dec 2012 21:15:28 -0800 (PST) X-AuditID: 1209190e-b7f516d0000008e4-1e-50cc07706446 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP id 42.8A.02276.0770CC05; Sat, 15 Dec 2012 00:15:28 -0500 (EST) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id qBF5FQS4023579; Sat, 15 Dec 2012 00:15:26 -0500 Received: from drake.dyndns.org (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com [209.6.116.242]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qBF5FOK6011445 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Sat, 15 Dec 2012 00:15:25 -0500 (EST) Received: from amthrax by drake.dyndns.org with local (Exim 4.77) (envelope-from ) id 1Tjk5s-0002kO-71; Sat, 15 Dec 2012 00:15:24 -0500 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH 3/7] emacs: Factor out synchronous notmuch JSON invocations Date: Sat, 15 Dec 2012 00:15:09 -0500 Message-Id: <1355548513-10085-4-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355548513-10085-1-git-send-email-amdragon@mit.edu> References: <1355548513-10085-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixG6nolvAfibA4GIPj8XquTwW12/OZHZg 8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4Mp70r2QseCNeceviMbYGxgXCXYycHBICJhLN u5+zQdhiEhfurQeyuTiEBPYxSmx4fZ0ZwtnAKNH1YBYLSJWQwCMmiTdHwiAScxklWp/9ZwVJ sAloSGzbv5wRxBYRkJbYeXc2WJxZwFHi8/5FYCuEBbwlVt46BmRzcLAIqEr8uq4IEuYVcJC4 92geK8QVihLdzyaAlXMCtS77eA5qr4PE2Vd3WScw8i9gZFjFKJuSW6Wbm5iZU5yarFucnJiX l1qka6yXm1mil5pSuokRFEacknw7GL8eVDrEKMDBqMTDuyPidIAQa2JZcWXuIUZJDiYlUd5b DGcChPiS8lMqMxKLM+KLSnNSiw8xSnAwK4nwim0BKudNSaysSi3Kh0lJc7AoifNeSbnpLySQ nliSmp2aWpBaBJOV4eBQkuD9wQY0VLAoNT21Ii0zpwQhzcTBCTKcB2j4fpAa3uKCxNzizHSI /ClGRSlx3qsgCQGQREZpHlwvLM5fMYoDvSLMGw1SxQNMEXDdr4AGMwENjrt0HGRwSSJCSgoY 3Uvjlz7JlIy225aXvPTkj5vma+TD1O+YdV0L36fCIv7x7fGn0Q/ue3y87x295vTnF32Lphxa y/teqnD58gkdK5pj1tq0LY/bwqjh0/xQ3SBHOq19evotay3pspdL1rt0M8R6O6u1ZDGrpFTw JhtOnvhoQplsztQNlx+f++OQ06z/6qdBYGCKEktxRqKhFnNRcSIACa1iqc4CAAA= 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, 15 Dec 2012 05:15:31 -0000 Previously this code was duplicated between show and reply. This factors out synchronously invoking notmuch and parsing the output as JSON. --- emacs/notmuch-lib.el | 14 ++++++++++++++ emacs/notmuch-mua.el | 8 +------- emacs/notmuch-query.el | 11 ++--------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index 851098f..4b71116 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -369,6 +369,20 @@ contents of ERR-FILE will be included in the error message." ;; Mimic `process-lines' (error "%s exited with status %s" (car command) exit-status)))) +(defun notmuch-call-notmuch-json (&rest args) + "Invoke `notmuch-command' with `args' and return the parsed JSON output. + +The returned output will represent objects using property lists +and arrays as lists." + + (with-temp-buffer + (apply #'call-process notmuch-command nil (list t nil) nil args) + (goto-char (point-min)) + (let ((json-object-type 'plist) + (json-array-type 'list) + (json-false 'nil)) + (json-read)))) + ;; 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-mua.el b/emacs/notmuch-mua.el index 408b49e..ac2d29e 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -158,13 +158,7 @@ list." (setq args (append args (list query-string))) ;; Get the reply object as JSON, and parse it into an elisp object. - (with-temp-buffer - (apply 'call-process (append (list notmuch-command nil (list t nil) nil) args)) - (goto-char (point-min)) - (let ((json-object-type 'plist) - (json-array-type 'list) - (json-false 'nil)) - (setq reply (json-read)))) + (setq reply (apply #'notmuch-call-notmuch-json args)) ;; Extract the original message to simplify the following code. (setq original (plist-get reply :original)) diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el index d66baea..e7e3520 100644 --- a/emacs/notmuch-query.el +++ b/emacs/notmuch-query.el @@ -29,18 +29,11 @@ A thread is a forest or list of trees. A tree is a two element list where the first element is a message, and the second element is a possibly empty forest of replies. " - (let ((args '("show" "--format=json")) - (json-object-type 'plist) - (json-array-type 'list) - (json-false 'nil)) + (let ((args '("show" "--format=json"))) (if notmuch-show-process-crypto (setq args (append args '("--decrypt")))) (setq args (append args search-terms)) - (with-temp-buffer - (progn - (apply 'call-process (append (list notmuch-command nil (list t nil) nil) args)) - (goto-char (point-min)) - (json-read))))) + (apply #'notmuch-call-notmuch-json args))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Mapping functions across collections of messages. -- 1.7.10.4