From 2dfd2382412dcd4d5417ea6553ac75432de5d674 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 5 Apr 2014 22:24:22 +0100 Subject: [PATCH] [PATCH 2/5] emacs: hello: use the saved-search helper functions --- e5/c4fd9d5e7e296a8e1a1f7fc5df803c6c3ba03c | 204 ++++++++++++++++++++++ 1 file changed, 204 insertions(+) create mode 100644 e5/c4fd9d5e7e296a8e1a1f7fc5df803c6c3ba03c diff --git a/e5/c4fd9d5e7e296a8e1a1f7fc5df803c6c3ba03c b/e5/c4fd9d5e7e296a8e1a1f7fc5df803c6c3ba03c new file mode 100644 index 000000000..e2acd331e --- /dev/null +++ b/e5/c4fd9d5e7e296a8e1a1f7fc5df803c6c3ba03c @@ -0,0 +1,204 @@ +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 DC8C6431FD7 + for ; Sat, 5 Apr 2014 14:24:57 -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 40x7qX-qgyHX for ; + Sat, 5 Apr 2014 14:24:52 -0700 (PDT) +Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com + [209.85.212.177]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id C85F3431FC2 + for ; Sat, 5 Apr 2014 14:24:47 -0700 (PDT) +Received: by mail-wi0-f177.google.com with SMTP id cc10so3059425wib.10 + for ; Sat, 05 Apr 2014 14:24:46 -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=r3ODfphJoiR2U84CiwW/8hyOZI2OF05FAWAYQ/iAtHs=; + b=cTkx7NCSBP8vGZMtBNB84mEMoyrDFQJ0kVP7bYZMDcBFf1Ga2J0qxzwkStotdZY39m + O5AuoieHiPjZLJWuHdv5q1Unjszukq5CVA2LdYL4HUW4uHVNsmOc0NkQIS9kxMNK0ft7 + wgUclP2RSXAEZnrJYsTucsb+rcZart6gLXm/c9ot6KrMcftD58qWq3hz+5dG9blFjYpS + T2gTbZ+GGQ1dMFCBex4qcdrk2whDosg0wRSKUKmz6qCQq12NVlhrB5tPP2jgx8hKaUwb + 7aIwLUAhC+vTLdt4Oin9HzGDc0BbdH9e3KBkO8WYXXB/l76KA66IpFplgtVMv++v7gw+ + XcIA== +X-Received: by 10.180.96.225 with SMTP id dv1mr14319177wib.37.1396733086709; + Sat, 05 Apr 2014 14:24:46 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id be3sm18587893wjc.5.2014.04.05.14.24.45 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sat, 05 Apr 2014 14:24:46 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 2/5] emacs: hello: use the saved-search helper functions +Date: Sat, 5 Apr 2014 22:24:22 +0100 +Message-Id: <1396733065-32602-3-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1396733065-32602-1-git-send-email-markwalters1009@gmail.com> +References: <1396733065-32602-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: Sat, 05 Apr 2014 21:24:58 -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 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. + + 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. + + 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 "*")) +-- +1.7.10.4 + -- 2.26.2