debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: Pass plist to `notmuch-search-show-result'

Browse source 
Rather than passing lots of arguments and then further passing those
to `notmuch-search-insert-field', pass a plist containing all of the
search result information.  This plist is compatible with the JSON
format search results.
This commit is contained in:
Austin Clements 2012-07-09 17:42:38 -04:00 committed by David Bremner
parent 17525340a2
commit 1a5bcdf6c1
1 changed files with 38 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
emacs/notmuch.el
View file

@ -707,42 +707,47 @@ non-authors is found, assume that all of the authors match."
(overlay-put overlay 'isearch-open-invisible #'delete-overlay))) (overlay-put overlay 'isearch-open-invisible #'delete-overlay)))
(insert padding)))) (insert padding))))
(defun notmuch-search-insert-field (field format-string date count authors subject tags) (defun notmuch-search-insert-field (field format-string result)
(cond (cond
((string-equal field "date") ((string-equal field "date")
(insert (propertize (format format-string date) (insert (propertize (format format-string (plist-get result :date_relative))
'face 'notmuch-search-date))) 'face 'notmuch-search-date)))
((string-equal field "count") ((string-equal field "count")
(insert (propertize (format format-string count) (insert (propertize (format format-string
(format "[%s/%s]" (plist-get result :matched)
(plist-get result :total)))
'face 'notmuch-search-count))) 'face 'notmuch-search-count)))
((string-equal field "subject") ((string-equal field "subject")
(insert (propertize (format format-string subject) (insert (propertize (format format-string (plist-get result :subject))
'face 'notmuch-search-subject))) 'face 'notmuch-search-subject)))
((string-equal field "authors") ((string-equal field "authors")
(notmuch-search-insert-authors format-string authors)) (notmuch-search-insert-authors format-string (plist-get result :authors)))
((string-equal field "tags") ((string-equal field "tags")
;; Ignore format-string here because notmuch-search-set-tags ;; Ignore format-string here because notmuch-search-set-tags
;; depends on the format of this ;; depends on the format of this
(insert (concat "(" (propertize tags 'font-lock-face 'notmuch-tag-face) ")"))))) (insert (concat "(" (propertize
(mapconcat 'identity (plist-get result :tags) " ")
'font-lock-face 'notmuch-tag-face) ")")))))
(defun notmuch-search-show-result (thread-id date count authors subject tags) (defun notmuch-search-show-result (result)
;; Ignore excluded matches ;; Ignore excluded matches
(unless (eq (aref count 1) ?0) (unless (= (plist-get result :matched) 0)
(let ((beg (point-max)) (let ((beg (point-max)))
(tags-str (mapconcat 'identity tags " ")))
(save-excursion (save-excursion
(goto-char beg) (goto-char beg)
(dolist (spec notmuch-search-result-format) (dolist (spec notmuch-search-result-format)
(notmuch-search-insert-field (car spec) (cdr spec) (notmuch-search-insert-field (car spec) (cdr spec) result))
date count authors subject tags-str))
(insert "\n") (insert "\n")
(notmuch-search-color-line beg (point) tags) (notmuch-search-color-line beg (point) (plist-get result :tags))
(put-text-property beg (point) 'notmuch-search-thread-id thread-id) (put-text-property beg (point) 'notmuch-search-thread-id
(put-text-property beg (point) 'notmuch-search-authors authors) (concat "thread:" (plist-get result :thread)))
(put-text-property beg (point) 'notmuch-search-subject subject)) (put-text-property beg (point) 'notmuch-search-authors
(when (string= thread-id notmuch-search-target-thread) (plist-get result :authors))
(put-text-property beg (point) 'notmuch-search-subject
(plist-get result :subject)))
(when (string= (plist-get result :thread) notmuch-search-target-thread)
(setq notmuch-search-target-thread "found") (setq notmuch-search-target-thread "found")
(goto-char beg))))) (goto-char beg)))))
@ -766,18 +771,24 @@ non-authors is found, assume that all of the authors match."
(while more (while more
(while (and (< line (length string)) (= (elt string line) ?\n)) (while (and (< line (length string)) (= (elt string line) ?\n))
(setq line (1+ line))) (setq line (1+ line)))
(if (string-match "^\\(thread:[0-9A-Fa-f]*\\) \\([^][]*\\) \\(\\[[0-9/]*\\]\\) \\([^;]*\\); \\(.*\\) (\\([^()]*\\))$" string line) (if (string-match "^thread:\\([0-9A-Fa-f]*\\) \\([^][]*\\) \\[\\([0-9]*\\)/\\([0-9]*\\)\\] \\([^;]*\\); \\(.*\\) (\\([^()]*\\))$" string line)
(let* ((thread-id (match-string 1 string)) (let* ((thread-id (match-string 1 string))
(date (match-string 2 string)) (tags-str (match-string 7 string))
(count (match-string 3 string)) (result (list :thread thread-id
(authors (match-string 4 string)) :date_relative (match-string 2 string)
(subject (match-string 5 string)) :matched (string-to-number
(tags (match-string 6 string)) (match-string 3 string))
(tag-list (if tags (save-match-data (split-string tags))))) :total (string-to-number
(if (/= (match-beginning 1) line) (match-string 4 string))
:authors (match-string 5 string)
:subject (match-string 6 string)
:tags (if tags-str
(save-match-data
(split-string tags-str))))))
(if (/= (match-beginning 0) line)
(notmuch-search-show-error (notmuch-search-show-error
(substring string line (match-beginning 1)))) (substring string line (match-beginning 0))))
(notmuch-search-show-result thread-id date count authors subject tag-list) (notmuch-search-show-result result)
(set 'line (match-end 0))) (set 'line (match-end 0)))
(set 'more nil) (set 'more nil)
(while (and (< line (length string)) (= (elt string line) ?\n)) (while (and (< line (length string)) (= (elt string line) ?\n))