--- /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 7DF61431FDA\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 12:04:37 -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 P-r50hoNwUEE for <notmuch@notmuchmail.org>;\r
+ Sat, 15 Dec 2012 12:04:36 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
+ [18.9.25.14])\r
+ by olra.theworths.org (Postfix) with ESMTP id 3E69E431FBF\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 12:04:35 -0800 (PST)\r
+X-AuditID: 1209190e-b7f516d0000008e4-ec-50ccd7d2aebf\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+ by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 7F.06.02276.2D7DCC05; Sat, 15 Dec 2012 15:04:34 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id qBFK4WjI014730; \r
+ Sat, 15 Dec 2012 15:04:32 -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 qBFK4Sjj025683\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 15 Dec 2012 15:04:31 -0500 (EST)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1TjxyG-0007sV-LN; Sat, 15 Dec 2012 15:04:28 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 3/7] emacs: Factor out synchronous notmuch JSON invocations\r
+Date: Sat, 15 Dec 2012 15:04:16 -0500\r
+Message-Id: <1355601860-30121-4-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1355601860-30121-1-git-send-email-amdragon@mit.edu>\r
+References: <1355601860-30121-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsUixG6nonvp+pkAg4VTVSxWz+WxuH5zJrPF\r
+ m5XzWB2YPXbOusvucfjrQhaPZ6tuMQcwR3HZpKTmZJalFunbJXBlXNp3h6ngjXjFm689jA2M\r
+ C4S7GDk5JARMJE63drBD2GISF+6tZ+ti5OIQEtjHKLHz/yJ2CGcDo8TMpxeYIZxHTBIHWh5C\r
+ lc1llNi2YTczSD+bgIbEtv3LGUFsEQFpiZ13Z7OC2MwCcRJbpvwHiwsL+Ek8efcfLM4ioCpx\r
+ sf8xG4jNK+Ag0bt0EQvEHYoS3c8mgMU5BRwlJk7exQRiCwHV3F4wh2kCI/8CRoZVjLIpuVW6\r
+ uYmZOcWpybrFyYl5ealFusZ6uZkleqkppZsYQeHFKcm3g/HrQaVDjAIcjEo8vDsiTgcIsSaW\r
+ FVfmHmKU5GBSEuXNuHwmQIgvKT+lMiOxOCO+qDQntfgQowQHs5IIb9J8oBxvSmJlVWpRPkxK\r
+ moNFSZz3SspNfyGB9MSS1OzU1ILUIpisDAeHkgSvEDCOhASLUtNTK9Iyc0oQ0kwcnCDDeYCG\r
+ c4DU8BYXJOYWZ6ZD5E8xKkqJ89qBJARAEhmleXC9sPh/xSgO9Iow74drQFU8wNQB1/0KaDAT\r
+ 0ODlNmCDSxIRUlINjJGM/OVnPvvqMM1vWMx266j/jyu8payR0x94Cpk/2dM4N6ZP+mBenOcC\r
+ s3s51SIsmr7zfstI+Cd4xD7XPlVjsaDRZAnPvPmegTMMP8zUEeFhMN1wX+fX/iVr2loO+i1w\r
+ 3nLS6tb16fNkuqMeHVcMyJXfEvz36KP5WpuCG/8v37REM9rOIrs1R4mlOCPRUIu5qDgRAO2H\r
+ aUzaAgAA\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: Sat, 15 Dec 2012 20:04:38 -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 f757ce7..f534770 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -371,6 +371,20 @@ contents of ERR-FILE will be included in the error message."\r
+ ;; Mimic `process-lines'\r
+ (error "%s exited with status %s" (car command) exit-status))))\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