From ba344c971217a422b3b751da8e30aec972bf8e69 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Fri, 6 Jul 2012 16:52:23 +2000 Subject: [PATCH] [PATCH v2 5/9] emacs: Pass plist to `notmuch-search-show-result' --- 9c/cf3c10a4da8ffd3c95a2f7d8631f4b7dd49b14 | 189 ++++++++++++++++++++++ 1 file changed, 189 insertions(+) create mode 100644 9c/cf3c10a4da8ffd3c95a2f7d8631f4b7dd49b14 diff --git a/9c/cf3c10a4da8ffd3c95a2f7d8631f4b7dd49b14 b/9c/cf3c10a4da8ffd3c95a2f7d8631f4b7dd49b14 new file mode 100644 index 000000000..27330b0f1 --- /dev/null +++ b/9c/cf3c10a4da8ffd3c95a2f7d8631f4b7dd49b14 @@ -0,0 +1,189 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 11DB7431FAF + for ; Thu, 5 Jul 2012 13:52:45 -0700 (PDT) +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 Payy2bhSgHfC for ; + Thu, 5 Jul 2012 13:52:43 -0700 (PDT) +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 18509431FB6 + for ; Thu, 5 Jul 2012 13:52:43 -0700 (PDT) +X-AuditID: 1209190e-b7fb56d0000008b2-39-4ff5fe9add99 +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP + id 8B.2A.02226.A9EF5FF4; Thu, 5 Jul 2012 16:52:42 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q65KqgMA019982; + Thu, 5 Jul 2012 16:52:42 -0400 +Received: from drake.dyndns.org (26-4-182.dynamic.csail.mit.edu [18.26.4.182]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q65Kqbrc027238 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Thu, 5 Jul 2012 16:52:39 -0400 (EDT) +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1Smt2T-0004Xh-Jp; Thu, 05 Jul 2012 16:52:37 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2 5/9] emacs: Pass plist to `notmuch-search-show-result' +Date: Thu, 5 Jul 2012 16:52:23 -0400 +Message-Id: <1341521547-15502-6-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1341521547-15502-1-git-send-email-amdragon@mit.edu> +References: <1341354059-29396-1-git-send-email-amdragon@mit.edu> + <1341521547-15502-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFrrIIsWRmVeSWpSXmKPExsUixG6nrjvr31d/gycrNSxWz+WxuH5zJrPF + m5XzWB2YPXbOusvucfjrQhaPZ6tuMQcwR3HZpKTmZJalFunbJXBl7NmxgrHgsGZFy4xmpgbG + jYpdjBwcEgImEsv7k7sYOYFMMYkL99azdTFycQgJ7GOUeNi/mQnCWc8ocWfZTxYI5ySTxJmb + MM5cRonLs/+xgPSzCWhIbNu/nBHEFhGQlth5dzYriM0sECexZcp/sLiwgKfEn/XzweIsAqoS + k3afZQI5g1fAQeLt5yqIM+Qlnt7vYwOxOQUcJS5MXAzWKiRQLvFnyT+WCYz8CxgZVjHKpuRW + 6eYmZuYUpybrFicn5uWlFuka6+VmluilppRuYgSFFqck3w7GrweVDjEKcDAq8fAa537xF2JN + LCuuzD3EKMnBpCTK2/j7q78QX1J+SmVGYnFGfFFpTmrxIUYJDmYlEd7eDKAcb0piZVVqUT5M + SpqDRUmc90rKTX8hgfTEktTs1NSC1CKYrAwHh5IE78q/QI2CRanpqRVpmTklCGkmDk6Q4TxA + w9eC1PAWFyTmFmemQ+RPMepyrHtz5AajEEtefl6qlDjvTJAiAZCijNI8uDmwlPCKURzoLWHe + TyBVPMB0AjfpFdASJqAleYs/gSwpSURISTUwuhSFdJVr/fktF+Opo3rD9SDvhiKFFE7pmram + uOWHnO7v5OZtsPm1IaPrU/WRH8Z6WSZeFz4wrnntNFn+h0eA5ZWbX36843t/Q2rlsfWFeTK7 + 3JNmnlHRmROmtlA0907WFS5F3YQL1r0vVA9sL492OWCepLLuwA7VRal7ptr93nE87prwSSle + JZbijERDLeai4kQACRTRAuQCAAA= +Cc: tomi.ollila@iki.fi +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: Thu, 05 Jul 2012 20:52:45 -0000 + +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. +--- + emacs/notmuch.el | 65 +++++++++++++++++++++++++++++++----------------------- + 1 file changed, 38 insertions(+), 27 deletions(-) + +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index 5bf01ca..dfeaf35 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -707,42 +707,47 @@ non-authors is found, assume that all of the authors match." + (overlay-put overlay 'isearch-open-invisible #'delete-overlay))) + (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 + ((string-equal field "date") +- (insert (propertize (format format-string date) ++ (insert (propertize (format format-string (plist-get result :date_relative)) + 'face 'notmuch-search-date))) + ((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))) + ((string-equal field "subject") +- (insert (propertize (format format-string subject) ++ (insert (propertize (format format-string (plist-get result :subject)) + 'face 'notmuch-search-subject))) + + ((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") + ;; Ignore format-string here because notmuch-search-set-tags + ;; 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 +- (unless (eq (aref count 1) ?0) +- (let ((beg (point-max)) +- (tags-str (mapconcat 'identity tags " "))) ++ (unless (= (plist-get result :matched) 0) ++ (let ((beg (point-max))) + (save-excursion + (goto-char beg) + (dolist (spec notmuch-search-result-format) +- (notmuch-search-insert-field (car spec) (cdr spec) +- date count authors subject tags-str)) ++ (notmuch-search-insert-field (car spec) (cdr spec) result)) + (insert "\n") +- (notmuch-search-color-line beg (point) tags) +- (put-text-property beg (point) 'notmuch-search-thread-id thread-id) +- (put-text-property beg (point) 'notmuch-search-authors authors) +- (put-text-property beg (point) 'notmuch-search-subject subject)) +- (when (string= thread-id notmuch-search-target-thread) ++ (notmuch-search-color-line beg (point) (plist-get result :tags)) ++ (put-text-property beg (point) 'notmuch-search-thread-id ++ (concat "thread:" (plist-get result :thread))) ++ (put-text-property beg (point) 'notmuch-search-authors ++ (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") + (goto-char beg))))) + +@@ -766,18 +771,24 @@ non-authors is found, assume that all of the authors match." + (while more + (while (and (< line (length string)) (= (elt string line) ?\n)) + (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)) +- (date (match-string 2 string)) +- (count (match-string 3 string)) +- (authors (match-string 4 string)) +- (subject (match-string 5 string)) +- (tags (match-string 6 string)) +- (tag-list (if tags (save-match-data (split-string tags))))) +- (if (/= (match-beginning 1) line) ++ (tags-str (match-string 7 string)) ++ (result (list :thread thread-id ++ :date_relative (match-string 2 string) ++ :matched (string-to-number ++ (match-string 3 string)) ++ :total (string-to-number ++ (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 +- (substring string line (match-beginning 1)))) +- (notmuch-search-show-result thread-id date count authors subject tag-list) ++ (substring string line (match-beginning 0)))) ++ (notmuch-search-show-result result) + (set 'line (match-end 0))) + (set 'more nil) + (while (and (< line (length string)) (= (elt string line) ?\n)) +-- +1.7.10 + -- 2.26.2