From: Mark Walters Date: Sun, 6 Apr 2014 05:44:46 +0000 (+0100) Subject: [PATCH v2 2/5] emacs: hello: use the saved-search helper functions X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ec8b840f507fb4bb9643045551b0f666486bc158;p=notmuch-archives.git [PATCH v2 2/5] emacs: hello: use the saved-search helper functions --- diff --git a/71/566c1b9d372fc4d83a88e216d2db9646834f77 b/71/566c1b9d372fc4d83a88e216d2db9646834f77 new file mode 100644 index 000000000..82ff78b01 --- /dev/null +++ b/71/566c1b9d372fc4d83a88e216d2db9646834f77 @@ -0,0 +1,205 @@ +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 15C38431FD4 + for ; Sat, 5 Apr 2014 22:45:16 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + 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 WmMQ3Q+gLWlH for ; + Sat, 5 Apr 2014 22:45:10 -0700 (PDT) +Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com + [209.85.212.182]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id A799A431FBF + for ; Sat, 5 Apr 2014 22:45:07 -0700 (PDT) +Received: by mail-wi0-f182.google.com with SMTP id d1so3311314wiv.9 + for ; Sat, 05 Apr 2014 22:45:06 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=NGRfCsBSC5wLIhMeVkPiijOAySG24U1BPVgFCyJv/7o=; + b=itN0RKcPs6fT1puvKhLoB5a+XkGHEWH4ylt/nkSl22fKpGahm8F2aGrje+Z0NiI5Fc + +q4b8XtIDy1k7urNuw5Ye5ZbFostGYTLnj6Vkc7FP9w7czZPxyGvaO7qZc5Qex6fJWhb + 9YEFgl3hRsMqDPQQeQmKwXbJEnc1jcL+CVvsFQINDBeX3mkTgQjhHSgUmlKUfJ4tZaIW + 8rlKxUQaY3hj41cCT2ipSW8F1dUhQapPNZwuvufNKw3bxlmMb3ns+cDHxTzqAiNcFlKZ + Soy0naGw0jlwfX/iFFVjIoCX1NJV1J6lgQIYzBx/GfP/e2zPtvUj+wgkg0MJI2ECOPDk + FsdQ== +X-Received: by 10.180.188.130 with SMTP id ga2mr16741265wic.18.1396763106564; + Sat, 05 Apr 2014 22:45:06 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id + rx9sm20131441wjb.20.2014.04.05.22.45.05 for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sat, 05 Apr 2014 22:45:05 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org, + amdragon@MIT.EDU +Subject: [PATCH v2 2/5] emacs: hello: use the saved-search helper functions +Date: Sun, 6 Apr 2014 06:44:46 +0100 +Message-Id: <1396763089-32452-3-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1396763089-32452-1-git-send-email-markwalters1009@gmail.com> +References: <1396763089-32452-1-git-send-email-markwalters1009@gmail.com> +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 05:45:16 -0000 + +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 f81ec27..568ae47 100644 +--- a/emacs/notmuch-hello.el ++++ b/emacs/notmuch-hello.el +@@ -318,7 +318,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 +@@ -338,7 +338,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) +@@ -417,13 +417,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-searches' for details. + + The result is the list of elements of the form (NAME QUERY COUNT). + +@@ -431,11 +430,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" " " +@@ -457,18 +454,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. +@@ -727,13 +721,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-searches' 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. + + Supports the following entries in OPTIONS as a plist: + :initially-hidden - if non-nil, section will be hidden on startup +@@ -767,7 +763,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 "*")) +-- +1.7.10.4 +