From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 80C28431FAE for ; Mon, 9 Jul 2012 14:42:55 -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 QcVSfCSrLhB9 for ; Mon, 9 Jul 2012 14:42:53 -0700 (PDT) Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU [18.7.68.37]) by olra.theworths.org (Postfix) with ESMTP id D5F5F429E30 for ; Mon, 9 Jul 2012 14:42:50 -0700 (PDT) X-AuditID: 12074425-b7f9b6d0000008c4-c7-4ffb505855a3 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP id F2.E0.02244.8505BFF4; Mon, 9 Jul 2012 17:42:48 -0400 (EDT) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q69LglAj003848; Mon, 9 Jul 2012 17:42:47 -0400 Received: from drake.dyndns.org (26-4-176.dynamic.csail.mit.edu [18.26.4.176]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q69LgiVe022686 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Mon, 9 Jul 2012 17:42:45 -0400 (EDT) Received: from amthrax by drake.dyndns.org with local (Exim 4.77) (envelope-from ) id 1SoLjA-0004g0-1C; Mon, 09 Jul 2012 17:42:44 -0400 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH v3 5/9] emacs: Pass plist to `notmuch-search-show-result' Date: Mon, 9 Jul 2012 17:42:38 -0400 Message-Id: <1341870162-17782-6-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1341870162-17782-1-git-send-email-amdragon@mit.edu> References: <1341354059-29396-1-git-send-email-amdragon@mit.edu> <1341870162-17782-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrEIsWRmVeSWpSXmKPExsUixG6nohsR8NvfYGu7nsXquTwW12/OZLZ4 s3IeqwOzx85Zd9k9Dn9dyOLxbNUt5gDmKC6blNSczLLUIn27BK6MPTtWMBYc1qxomdHM1MC4 UbGLkZNDQsBE4tOfb4wQtpjEhXvr2boYuTiEBPYxSny4tYcFwlnPKNE+4SYrhHOSSeLjlyWM EM5cRonl94+zgfSzCWhIbNu/HGyWiIC0xM67s1lBbGaBOIktU/4DxTk4hAU8JRbskgcJswio Ssw42MoMYvMKOEisPzyBCeIMeYmn9/vARnIKOErMubkDbKSQQLnE5xv/mCcw8i9gZFjFKJuS W6Wbm5iZU5yarFucnJiXl1qka6GXm1mil5pSuokRHFwuqjsYJxxSOsQowMGoxMO7keW3vxBr YllxZe4hRkkOJiVR3jxPoBBfUn5KZUZicUZ8UWlOavEhRgkOZiUR3luuQDnelMTKqtSifJiU NAeLkjjvjZSb/kIC6YklqdmpqQWpRTBZGQ4OJQneaf5AjYJFqempFWmZOSUIaSYOTpDhPEDD J4DU8BYXJOYWZ6ZD5E8x6nKse3PkBqMQS15+XqqUOO9kkCIBkKKM0jy4ObCk8IpRHOgtYd4i kCoeYEKBm/QKaAkT0JL2nl8gS0oSEVJSDYzFZmliZR7G71b4O7oeL85gsXv80er+inqbbsMV ijpsktc2b5usV5EVtPCCRtwBV96+nh9Pb/yY7Hjny4tEgd+1HM2f58zvOZDjv6bkwXHGR9tv 8zuf1OV+bLVprfaxwm7B+m8Xk4LzIlIUM6pt+Hg0jd5yZvGemrlDLnGlxUqDwItNF7LyRJVY ijMSDbWYi4oTAd18xl/lAgAA 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: Mon, 09 Jul 2012 21:42:56 -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