cli: implement structured output version 4

[notmuch] / emacs / notmuch-query.el

diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el
index 26f954474227f15052692ff6ba46479baf4350b7..592fd8f1cd88eeac4d77cd6b58a33fb3cde88053 100644 (file)
--- a/emacs/notmuch-query.el
+++ b/emacs/notmuch-query.el
@@ -1,4 +1,4 @@
-;; notmuch-query.el --- provide an emacs api to query notmuch
+;;; notmuch-query.el --- provide an emacs api to query notmuch

 ;;
 ;; Copyright © David Bremner
 ;;
 ;;
 ;; Copyright © David Bremner
 ;;


@@ -15,29 +15,26 @@
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
 ;; General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License

-;; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.

 ;;
 ;; Authors: David Bremner <david@tethera.net>
 
 ;;
 ;; Authors: David Bremner <david@tethera.net>
 

+;;; Code:
+

 (require 'notmuch-lib)
 (require 'notmuch-lib)

-(require 'json)

 
 

-(defun notmuch-query-get-threads (search-terms &rest options)
+(defun notmuch-query-get-threads (search-terms)

   "Return a list of threads of messages matching SEARCH-TERMS.
 
 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.
 "
   "Return a list of threads of messages matching SEARCH-TERMS.
 
 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 (append '("show" "--format=json") search-terms))
-        (json-object-type 'plist)
-        (json-array-type 'list)
-        (json-false 'nil))
-    (with-temp-buffer
-      (progn
-       (apply 'call-process (append (list notmuch-command nil t nil) args))
-       (goto-char (point-min))
-       (json-read)))))
+  (let ((args '("show" "--format=sexp" "--format-version=4")))
+    (if notmuch-show-process-crypto
+       (setq args (append args '("--decrypt"))))
+    (setq args (append args search-terms))
+    (apply #'notmuch-call-notmuch-sexp args)))

 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Mapping functions across collections of messages.
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Mapping functions across collections of messages.


@@ -79,3 +76,5 @@ See the function notmuch-query-get-threads for more information."
    (notmuch-query-get-threads search-terms)))
 
 (provide 'notmuch-query)
    (notmuch-query-get-threads search-terms)))
 
 (provide 'notmuch-query)

+
+;;; notmuch-query.el ends here