hex-escape: (en|de)code strings to/from restricted character set

[notmuch] / contrib / notmuch-pick / notmuch-pick.el

diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el
index be6a91a77b5325f70d5c93ea30a29a4083f2045c..5f9e456354f05be143ffdf201e40d84ac69a5e13 100644 (file)
--- a/contrib/notmuch-pick/notmuch-pick.el
+++ b/contrib/notmuch-pick/notmuch-pick.el
@@ -241,7 +241,10 @@ Some useful entries are:
 
 (defun notmuch-pick-get-message-id ()
   "Return the message id of the current message."
-  (concat "id:\"" (notmuch-pick-get-prop :id) "\""))
+  (let ((id (notmuch-pick-get-prop :id)))
+    (if id
+       (notmuch-id-to-query id)
+      nil)))
 
 (defun notmuch-pick-get-match ()
   "Return whether the current message is a match."
@@ -435,7 +438,7 @@ Does NOT change the database."
   (unless (notmuch-pick-get-match)
     (notmuch-pick-next-matching-message))
   (while (and (not (notmuch-pick-get-match))
-             (not (eq notmuch-pick-process-state 'end)))
+             (get-buffer-process (current-buffer)))
     (message "waiting for message")
     (sit-for 0.1)
     (goto-char (point-min))
@@ -733,9 +736,6 @@ Complete list of currently available key bindings:
     (insert "\n")))
 
 
-(defvar notmuch-pick-json-parser nil
-  "Incremental JSON parser for the search process filter.")
-
 (defun notmuch-pick-process-filter (proc string)
   "Process and filter the output of \"notmuch show\" (for pick)"
   (let ((results-buf (process-buffer proc))
@@ -748,46 +748,10 @@ Complete list of currently available key bindings:
         ;; Insert new data
         (save-excursion
           (goto-char (point-max))
-          (insert string)))
-      (with-current-buffer results-buf
-       (save-excursion
-         (goto-char (point-max))
-         (while (not done)
-           (condition-case nil
-               (case notmuch-pick-process-state
-                     ((begin)
-                      ;; Enter the results list
-                      (if (eq (notmuch-json-begin-compound
-                               notmuch-pick-json-parser) 'retry)
-                          (setq done t)
-                        (setq notmuch-pick-process-state 'result)))
-                     ((result)
-                      ;; Parse a result
-                      (let ((result (notmuch-json-read notmuch-pick-json-parser)))
-                        (case result
-                              ((retry) (setq done t))
-                              ((end) (setq notmuch-pick-process-state 'end))
-                              (otherwise (notmuch-pick-insert-forest-thread result)))))
-                     ((end)
-                      ;; Any trailing data is unexpected
-                      (with-current-buffer parse-buf
-                        (skip-chars-forward " \t\r\n")
-                        (if (eobp)
-                            (setq done t)
-                          (signal 'json-error nil)))))
-             (json-error
-              ;; Do our best to resynchronize and ensure forward
-              ;; progress
-              (notmuch-pick-show-error
-               "%s"
-               (with-current-buffer parse-buf
-                 (let ((bad (buffer-substring (line-beginning-position)
-                                              (line-end-position))))
-                   (forward-line)
-                   bad))))))
-         ;; Clear out what we've parsed
-         (with-current-buffer parse-buf
-           (delete-region (point-min) (point))))))))
+          (insert string))
+       (notmuch-json-parse-partial-list 'notmuch-pick-insert-forest-thread
+                                        'notmuch-pick-show-error
+                                        results-buf)))))
 
 (defun notmuch-pick-worker (basic-query &optional query-context buffer)
   (interactive)
@@ -804,8 +768,6 @@ Complete list of currently available key bindings:
         (message-arg "--entire-thread"))
     (if (equal (car (process-lines notmuch-command "count" search-args)) "0")
        (setq search-args basic-query))
-    (message "starting parser %s"
-            (format-time-string "%r"))
     (if notmuch-pick-asynchronous-parser
        (let ((proc (start-process
                     "notmuch-pick" buffer
@@ -815,9 +777,6 @@ Complete list of currently available key bindings:
               ;; This buffer will be killed by the sentinel, which
               ;; should be called no matter how the process dies.
               (parse-buf (generate-new-buffer " *notmuch pick parse*")))
-          (set (make-local-variable 'notmuch-pick-process-state) 'begin)
-          (set (make-local-variable 'notmuch-pick-json-parser)
-               (notmuch-json-create-parser parse-buf))
           (process-put proc 'parse-buf parse-buf)
          (set-process-sentinel proc 'notmuch-pick-process-sentinel)
          (set-process-filter proc 'notmuch-pick-process-filter)
@@ -828,9 +787,7 @@ Complete list of currently available key bindings:
          (list "--body=false" message-arg search-args)))
        (save-excursion
          (goto-char (point-max))
-         (insert "End of search results.\n"))
-       (message "sync parser finished %s"
-                (format-time-string "%r"))))))
+         (insert "End of search results.\n"))))))
 
 
 (defun notmuch-pick (&optional query query-context buffer-name show-first-match)