From c52c3cc5ff16b0fd433e19d2e302cb4cdac95c2d Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Sun, 6 Apr 2014 21:06:09 +2000 Subject: [PATCH] Re: [PATCH 2/5] emacs: hello: use the saved-search helper functions --- 2b/41d57ac7c90a9552d5a7703d48266e13fd84ea | 231 ++++++++++++++++++++++ 1 file changed, 231 insertions(+) create mode 100644 2b/41d57ac7c90a9552d5a7703d48266e13fd84ea diff --git a/2b/41d57ac7c90a9552d5a7703d48266e13fd84ea b/2b/41d57ac7c90a9552d5a7703d48266e13fd84ea new file mode 100644 index 000000000..c77a3f006 --- /dev/null +++ b/2b/41d57ac7c90a9552d5a7703d48266e13fd84ea @@ -0,0 +1,231 @@ +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 1ED8C431FB6 + for ; Sat, 5 Apr 2014 18:06:18 -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 KXfLHtTvCbNf for ; + Sat, 5 Apr 2014 18:06:14 -0700 (PDT) +Received: from dmz-mailsec-scanner-8.mit.edu (dmz-mailsec-scanner-8.mit.edu + [18.7.68.37]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id AA810431FAF + for ; Sat, 5 Apr 2014 18:06:13 -0700 (PDT) +X-AuditID: 12074425-f79906d000000cf9-15-5340a884b2aa +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + (using TLS with cipher AES256-SHA (256/256 bits)) + (Client did not present a certificate) + by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP + id C5.B4.03321.488A0435; Sat, 5 Apr 2014 21:06:12 -0400 (EDT) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s3616B8B006806; + Sat, 5 Apr 2014 21:06:12 -0400 +Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s36169R9015178 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); + Sat, 5 Apr 2014 21:06:11 -0400 +Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80) + (envelope-from ) + id 1WWbXF-00071G-MA; Sat, 05 Apr 2014 21:06:09 -0400 +Date: Sat, 5 Apr 2014 21:06:09 -0400 +From: Austin Clements +To: Mark Walters +Subject: Re: [PATCH 2/5] emacs: hello: use the saved-search helper functions +Message-ID: <20140406010609.GE15472@mit.edu> +References: <1396733065-32602-1-git-send-email-markwalters1009@gmail.com> + <1396733065-32602-3-git-send-email-markwalters1009@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +In-Reply-To: <1396733065-32602-3-git-send-email-markwalters1009@gmail.com> +User-Agent: Mutt/1.5.21 (2010-09-15) +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFmpileLIzCtJLcpLzFFi42IRYrdT121Z4RBs8GSThsXquTwW12/OZHZg + 8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4Mp5+fclWMM+0omf1FOYGxiatLkZODgkBE4lF + R1azQNhiEhfurWfrYuTiEBKYzSTxZu9SdpCEkMAGRom2BS4QiVNMEn8+/maFSCxhlNgyJx/E + ZhFQkVhy7xUbiM0moCGxbf9yRhBbREBH4vahBWCDmAWkJb79bmYCsYUFfCQOPmoEq+EFqjn/ + 7SMjxIJORonVu36xQyQEJU7OfMIC0awlcePfS6BmDrBBy/9xgIQ5Bbwk3l9bzAxiiwLdMOXk + NrYJjEKzkHTPQtI9C6F7ASPzKkbZlNwq3dzEzJzi1GTd4uTEvLzUIl0LvdzMEr3UlNJNjOCg + dlHdwTjhkNIhRgEORiUe3gt5DsFCrIllxZW5hxglOZiURHm7ZgCF+JLyUyozEosz4otKc1KL + DzFKcDArifA+CQLK8aYkVlalFuXDpKQ5WJTEed9aWwULCaQnlqRmp6YWpBbBZGU4OJQkeK8v + B2oULEpNT61Iy8wpQUgzcXCCDOcBGv4TpIa3uCAxtzgzHSJ/ilFRSpy3ESQhAJLIKM2D64Ul + nVeM4kCvCPP+AaniASYsuO5XQIOZgAY3hNmBDC5JREhJNTD6bHGM081VTXzEMXmjegOnyiXZ + U/u3t235tuZZutm+qnebHtRNaLmVoLO5PPVi1+ftIvphjPHr3qrvLTivcdD6KNdNtUmPF1lN + sJ8b8adks8PvEvPb5Uq7n76ybfS31DpmfrFAI/jMA8OjL8K8bnvmNU+9uydXkL0h+59JkI7J + d985IvOrd+sosRRnJBpqMRcVJwIA4BakoBUDAAA= +Cc: notmuch@notmuchmail.org +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: Sun, 06 Apr 2014 01:06:18 -0000 + +Quoth Mark Walters on Apr 05 at 10:24 pm: +> This uses the helper functions: the saved searches format has not +> changed yet but backwards compatibility means everything still works. +> --- +> emacs/notmuch-hello.el | 48 ++++++++++++++++++++++-------------------------- +> emacs/notmuch.el | 6 +++--- +> 2 files changed, 25 insertions(+), 29 deletions(-) +> +> diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el +> index 0b9ed16..733208b 100644 +> --- a/emacs/notmuch-hello.el +> +++ b/emacs/notmuch-hello.el +> @@ -319,7 +319,7 @@ (defun notmuch-hello-add-saved-search (widget) +> (setq notmuch-saved-searches +> (loop for elem in notmuch-saved-searches +> if (not (equal name +> - (car elem))) +> + (notmuch-saved-search-get elem :name))) +> collect elem)) +> ;; Add the new one. +> (customize-save-variable 'notmuch-saved-searches +> @@ -339,7 +339,7 @@ (defun notmuch-hello-delete-search-from-history (widget) +> +> (defun notmuch-hello-longest-label (searches-alist) +> (or (loop for elem in searches-alist +> - maximize (length (car elem))) +> + maximize (length (notmuch-saved-search-get elem :name))) +> 0)) +> +> (defun notmuch-hello-reflect-generate-row (ncols nrows row list) +> @@ -418,13 +418,12 @@ (defun notmuch-hello-filtered-query (query filter) +> (concat "(" query ") and (" filter ")")) +> (t query))) +> +> -(defun notmuch-hello-query-counts (query-alist &rest options) +> - "Compute list of counts of matched messages from QUERY-ALIST. +> +(defun notmuch-hello-query-counts (query-list &rest options) +> + "Compute list of counts of matched messages from QUERY-LIST. +> +> -QUERY-ALIST must be a list containing elements of the form (NAME . QUERY) +> -or (NAME QUERY COUNT-QUERY). If the latter form is used, +> -COUNT-QUERY specifies an alternate query to be used to generate +> -the count for the associated query. +> +QUERY-LIST must be a list of saved-searches. Ideally each of +> +these is a plist but other options are available for backwards +> +compatibility: see notmuch-saved-search-get for details. + +s/:/./ Also `'s around notmuch-saved-search-get. + +Actually, the accepted formats (including the understood keys in plist +form) should be documented in `notmuch-saved-searches' and this +information should be cited elsewhere and not duplicated. + +> +> The result is the list of elements of the form (NAME QUERY COUNT). +> +> @@ -432,11 +431,9 @@ (defun notmuch-hello-query-counts (query-alist &rest options) +> options will be handled as specified for +> `notmuch-hello-insert-searches'." +> (with-temp-buffer +> - (dolist (elem query-alist nil) +> - (let ((count-query (if (consp (cdr elem)) +> - ;; do we have a different query for the message count? +> - (third elem) +> - (cdr elem)))) +> + (dolist (elem query-list nil) +> + (let ((count-query (or (notmuch-saved-search-get elem :count-query) +> + (notmuch-saved-search-get elem :query)))) +> (insert +> (replace-regexp-in-string +> "\n" " " +> @@ -458,18 +455,15 @@ (defun notmuch-hello-query-counts (query-alist &rest options) +> #'identity +> (mapcar +> (lambda (elem) +> - (let ((name (car elem)) +> - (search-query (if (consp (cdr elem)) +> - ;; do we have a different query for the message count? +> - (second elem) +> - (cdr elem))) +> + (let ((name (notmuch-saved-search-get elem :name)) +> + (search-query (notmuch-saved-search-get elem :query)) +> (message-count (prog1 (read (current-buffer)) +> (forward-line 1)))) +> (and (or (plist-get options :show-empty-searches) (> message-count 0)) +> (list name (notmuch-hello-filtered-query +> search-query (plist-get options :filter)) +> message-count)))) +> - query-alist)))) +> + query-list)))) +> +> (defun notmuch-hello-insert-buttons (searches) +> "Insert buttons for SEARCHES. +> @@ -728,13 +722,15 @@ (defun notmuch-hello-insert-recent-searches () +> (indent-rigidly start (point) notmuch-hello-indent)) +> nil)) +> +> -(defun notmuch-hello-insert-searches (title query-alist &rest options) +> - "Insert a section with TITLE showing a list of buttons made from QUERY-ALIST. +> +(defun notmuch-hello-insert-searches (title query-list &rest options) +> + "Insert a section with TITLE showing a list of buttons made from QUERY-LIST. +> +> -QUERY-ALIST must be a list containing elements of the form (NAME . QUERY) +> -or (NAME QUERY COUNT-QUERY). If the latter form is used, +> -COUNT-QUERY specifies an alternate query to be used to generate +> -the count for the associated item. +> +QUERY-LIST should ideally be a plist but for backwards +> +compatibility other forms are also accepted (see +> +`notmuch-saved-search-get' for details). The plist should +> +contain keys :name and :query; if :count-query is also present +> +then it specifies an alternate query to be used to generate the +> +count for the associated search. + +Same comment about moving this format documentation to +`notmuch-saved-searches'. + +> +> Supports the following entries in OPTIONS as a plist: +> :initially-hidden - if non-nil, section will be hidden on startup +> @@ -768,7 +764,7 @@ (defun notmuch-hello-insert-searches (title query-alist &rest options) +> "hide")) +> (widget-insert "\n") +> (when (not is-hidden) +> - (let ((searches (apply 'notmuch-hello-query-counts query-alist options))) +> + (let ((searches (apply 'notmuch-hello-query-counts query-list options))) +> (when (or (not (plist-get options :hide-if-empty)) +> searches) +> (widget-insert "\n") +> diff --git a/emacs/notmuch.el b/emacs/notmuch.el +> index 233c784..1346b90 100644 +> --- a/emacs/notmuch.el +> +++ b/emacs/notmuch.el +> @@ -823,14 +823,14 @@ (defun notmuch-search-buffer-title (query) +> (let (longest +> (longest-length 0)) +> (loop for tuple in notmuch-saved-searches +> - if (let ((quoted-query (regexp-quote (cdr tuple)))) +> + if (let ((quoted-query (regexp-quote (notmuch-saved-search-get tuple :query)))) +> (and (string-match (concat "^" quoted-query) query) +> (> (length (match-string 0 query)) +> longest-length))) +> do (setq longest tuple)) +> longest)) +> - (saved-search-name (car saved-search)) +> - (saved-search-query (cdr saved-search))) +> + (saved-search-name (notmuch-saved-search-get saved-search :name)) +> + (saved-search-query (notmuch-saved-search-get saved-search :query))) +> (cond ((and saved-search (equal saved-search-query query)) +> ;; Query is the same as saved search (ignoring case) +> (concat "*notmuch-saved-search-" saved-search-name "*")) -- 2.26.2