From f1da36f06b80b9455a9eb5e373267bee4bfde0fa Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 4 Jul 2012 18:20:56 +2000 Subject: [PATCH] [PATCH 5/8] emacs: Pass plist to `notmuch-search-show-result' --- 58/5b2311bd3b1a3e9d06b6d706394db79496740e | 187 ++++++++++++++++++++++ 1 file changed, 187 insertions(+) create mode 100644 58/5b2311bd3b1a3e9d06b6d706394db79496740e diff --git a/58/5b2311bd3b1a3e9d06b6d706394db79496740e b/58/5b2311bd3b1a3e9d06b6d706394db79496740e new file mode 100644 index 000000000..d13130d2e --- /dev/null +++ b/58/5b2311bd3b1a3e9d06b6d706394db79496740e @@ -0,0 +1,187 @@ +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 526F0431FAF + for ; Tue, 3 Jul 2012 15:21:12 -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 FxdQj+cqzivA for ; + Tue, 3 Jul 2012 15:21:10 -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 93AA0431FC2 + for ; Tue, 3 Jul 2012 15:21:06 -0700 (PDT) +X-AuditID: 1209190e-b7fb56d0000008b2-5c-4ff3705269de +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP + id B8.C6.02226.25073FF4; Tue, 3 Jul 2012 18:21:06 -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 q63ML5WX010808; + Tue, 3 Jul 2012 18:21:05 -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 q63ML1vJ023223 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Tue, 3 Jul 2012 18:21:02 -0400 (EDT) +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1SmBSv-0007fV-1W; Tue, 03 Jul 2012 18:21:01 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH 5/8] emacs: Pass plist to `notmuch-search-show-result' +Date: Tue, 3 Jul 2012 18:20:56 -0400 +Message-Id: <1341354059-29396-6-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1341354059-29396-1-git-send-email-amdragon@mit.edu> +References: <1341354059-29396-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFrrLIsWRmVeSWpSXmKPExsUixG6nrhtU8NnfoHEfu8WRPbPYLZae+c9s + cf3mTGaLNyvnsTqweOycdZfd4/DXhSwez1bdYvZo+rGYNYAlissmJTUnsyy1SN8ugStj+8JH + rAXLNSp+/9jN1MA4TaGLkZNDQsBEYt/qV6wQtpjEhXvr2boYuTiEBPYxSkxZfYMVwlnPKLFg + 1z2wKiGBk0wSazrKIBJzGSWudW5gA0mwCWhIbNu/nBHEFhGQlth5dzZYA7NArsTZ1sNgcWEB + N4nex/eZQGwWAVWJTe9es4PYvAIOEo9+PGKDOENe4un9PjCbU8BRYsXNsywQix0ktn3oYJ3A + yL+AkWEVo2xKbpVubmJmTnFqsm5xcmJeXmqRrrFebmaJXmpK6SZGUMhxSvLtYPx6UOkQowAH + oxIPb7LCZ38h1sSy4srcQ4ySHExKorxX8oBCfEn5KZUZicUZ8UWlOanFhxglOJiVRHhXJwHl + eFMSK6tSi/JhUtIcLErivFdSbvoLCaQnlqRmp6YWpBbBZGU4OJQkeFvzgRoFi1LTUyvSMnNK + ENJMHJwgw3mAhmeD1PAWFyTmFmemQ+RPMepyrHtz5AajEEtefl6qlDjvTpAiAZCijNI8uDmw + VPGKURzoLWHeTpAqHmCagZv0CmgJE9CSvMWfQJaUJCKkpBoYV+qd3/C1acrfyaaTZ5zb08t5 + UCdklpV91OPfmxZqiO7quON8IfnfxwLvdRvM0z4dNzR776vZ/CuNKVhr3RuB6+c2L3t+2mDl + O6VlWxl590sskxbS2n//8QLGGVPnHz1T/2WZz5NHr1er+Vx583eXZoPjv4MyCaHXL6YuZb39 + 8LPD/2UW+3/afPdTYinOSDTUYi4qTgQAdZIFfPACAAA= +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: Tue, 03 Jul 2012 22:21:12 -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 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 a073367..084cec6 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -707,41 +707,46 @@ 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 date count authors subject tags) ++(defun notmuch-search-insert-field (field format result) + (cond + ((string-equal field "date") +- (insert (propertize (format format date) ++ (insert (propertize (format format (plist-get result :date_relative)) + 'face 'notmuch-search-date))) + ((string-equal field "count") +- (insert (propertize (format format count) ++ (insert (propertize (format format (format "[%s/%s]" ++ (plist-get result :matched) ++ (plist-get result :total))) + 'face 'notmuch-search-count))) + ((string-equal field "subject") +- (insert (propertize (format format subject) ++ (insert (propertize (format format (plist-get result :subject)) + 'face 'notmuch-search-subject))) + + ((string-equal field "authors") +- (notmuch-search-insert-authors format authors)) ++ (notmuch-search-insert-authors format (plist-get result :authors))) + + ((string-equal field "tags") + (insert +- (format format (propertize tags 'font-lock-face 'notmuch-tag-face)))))) ++ (format format (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 (format notmuch-search-result-format) +- (notmuch-search-insert-field (car format) (cdr format) +- date count authors subject tags-str)) ++ (notmuch-search-insert-field (car format) (cdr format) 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))))) + +@@ -765,18 +770,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