[PATCH 0/2] Saved searches in tree view

[PATCH 0/2] Saved searches in tree view

[Mark Walters]

The first patch allows the user to customize saved searches to show
in tree view rather than search view (the choice also applies when the
saved-search is called from notmuch-jump rather than notmuch-hello).

The second patch lets a user switch back from tree mode to search mode
with "S". This is analogous to using Z to switch from search mode or
show mode to tree mode. This patch is independent of the first patch,
but is more likely to be useful after the first patch.

One small caveat: if you customize the saved-searches then existing
notmuch-hello buffers are not updated -- you need to refresh the
buffer before the change will register. (The same is true for changing
the sort order etc)

Best wishes 

Mark


Mark Walters (2):
  emacs: allow saved searches to select tree-view
  emacs: tree: bind S to run the current query in search mode

 emacs/notmuch-hello.el | 21 ++++++++++++++++-----
 emacs/notmuch-jump.el  |  4 +++-
 emacs/notmuch-tree.el  |  8 ++++++++
 3 files changed, 27 insertions(+), 6 deletions(-)

-- 
2.1.4

[PATCH 1/2] emacs: allow saved searches to select tree-view

[Mark Walters]

This patch allows the user to customize a saved search to choose tree
view rather than the default search view. It also updates notmuch-jump
so that it respects this choice.
---
 emacs/notmuch-hello.el | 21 ++++++++++++++++-----
 emacs/notmuch-jump.el  |  4 +++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 7bfa752..d9fe3ff 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -28,6 +28,8 @@
 
 (declare-function notmuch-search "notmuch" (&optional query oldest-first target-thread target-line continuation))
 (declare-function notmuch-poll "notmuch" ())
+(declare-function notmuch-tree "notmuch-tree"
+                  (&optional query query-context target buffer-name open-target))
 
 (defun notmuch-saved-search-get (saved-search field)
   "Get FIELD from SAVED-SEARCH.
@@ -91,7 +93,11 @@ searches so they still work in customize."
 			    (choice :tag " Sort Order"
 				    (const :tag "Default" nil)
 				    (const :tag "Oldest-first" oldest-first)
-				    (const :tag "Newest-first" newest-first))))))
+				    (const :tag "Newest-first" newest-first)))
+		     (group :format "%v" :inline t (const :format "" :search-type)
+			    (choice :tag " Search Type"
+				    (const :tag "Search mode" nil)
+				    (const :tag "Tree mode" tree))))))
 
 (defcustom notmuch-saved-searches
   `((:name "inbox" :query "tag:inbox" :key ,(kbd "i"))
@@ -425,10 +431,13 @@ diagonal."
 	  append (notmuch-hello-reflect-generate-row ncols nrows row list))))
 
 (defun notmuch-hello-widget-search (widget &rest ignore)
-  (notmuch-search (widget-get widget
-			      :notmuch-search-terms)
-		  (widget-get widget
-			      :notmuch-search-oldest-first)))
+  (if (widget-get widget :notmuch-search-type)
+      (notmuch-tree (widget-get widget
+				:notmuch-search-terms))
+    (notmuch-search (widget-get widget
+				:notmuch-search-terms)
+		    (widget-get widget
+				:notmuch-search-oldest-first))))
 
 (defun notmuch-saved-search-count (search)
   (car (process-lines notmuch-command "count" search)))
@@ -564,6 +573,7 @@ with `notmuch-hello-query-counts'."
 				     (newest-first nil)
 				     (oldest-first t)
 				     (otherwise notmuch-search-oldest-first)))
+		     (search-type (eq (plist-get elem :search-type) 'tree))
 		     (msg-count (plist-get elem :count)))
 		(widget-insert (format "%8s "
 				       (notmuch-hello-nice-number msg-count)))
@@ -571,6 +581,7 @@ with `notmuch-hello-query-counts'."
 			       :notify #'notmuch-hello-widget-search
 			       :notmuch-search-terms query
 			       :notmuch-search-oldest-first oldest-first
+			       :notmuch-search-type search-type
 			       name)
 		(setq column-indent
 		      (1+ (max 0 (- column-width (length name)))))))
diff --git a/emacs/notmuch-jump.el b/emacs/notmuch-jump.el
index 20e24b2..506ae2c 100644
--- a/emacs/notmuch-jump.el
+++ b/emacs/notmuch-jump.el
@@ -54,7 +54,9 @@ fast way to jump to a saved search from anywhere in Notmuch."
 		   (oldest-first t)
 		   (otherwise (default-value 'notmuch-search-oldest-first)))))
 	    (push (list key name
-			`(lambda () (notmuch-search ',query ',oldest-first)))
+			(if (eq (plist-get saved-search :search-type) 'tree)
+			    `(lambda () (notmuch-tree ',query))
+			  `(lambda () (notmuch-search ',query ',oldest-first))))
 		  action-map)))))
     (setq action-map (nreverse action-map))
 
-- 
2.1.4

[PATCH 2/2] emacs: tree: bind S to run current query in search mode

[Mark Walters]

---
 emacs/notmuch-tree.el | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index 182235e..8d464a9 100644
--- a/emacs/notmuch-tree.el
+++ b/emacs/notmuch-tree.el
@@ -240,6 +240,8 @@ FUNC."
     ;; Override because we want to close message pane first.
     (define-key map [remap notmuch-mua-new-mail] (notmuch-tree-close-message-pane-and #'notmuch-mua-new-mail))
 
+    (define-key map "S" 'notmuch-search-from-tree-current-query)
+
     ;; these use notmuch-show functions directly
     (define-key map "|" 'notmuch-show-pipe-message)
     (define-key map "w" 'notmuch-show-save-attachments)
@@ -402,6 +404,12 @@ Does NOT change the database."
     (notmuch-tree-close-message-window)
     (notmuch-tree query)))
 
+(defun notmuch-search-from-tree-current-query ()
+  "Call notmuch search with the current query"
+  (interactive)
+  (notmuch-tree-close-message-window)
+  (notmuch-search (notmuch-tree-get-query)))
+
 (defun notmuch-tree-message-window-kill-hook ()
   "Close the message pane when exiting the show buffer."
   (let ((buffer (current-buffer)))
-- 
2.1.4

Re: [PATCH 0/2] Saved searches in tree view

[Jani Nikula]

On Wed, 14 Oct 2015, Mark Walters <markwalters1009@gmail.com> wrote:
> The first patch allows the user to customize saved searches to show
> in tree view rather than search view (the choice also applies when the
> saved-search is called from notmuch-jump rather than notmuch-hello).
>
> The second patch lets a user switch back from tree mode to search mode
> with "S". This is analogous to using Z to switch from search mode or
> show mode to tree mode. This patch is independent of the first patch,
> but is more likely to be useful after the first patch.

I like these, seems to work nicely. Can't offer much in terms of review
though.

BR,
Jani.

>
> One small caveat: if you customize the saved-searches then existing
> notmuch-hello buffers are not updated -- you need to refresh the
> buffer before the change will register. (The same is true for changing
> the sort order etc)
>
> Best wishes 
>
> Mark
>
>
> Mark Walters (2):
>   emacs: allow saved searches to select tree-view
>   emacs: tree: bind S to run the current query in search mode
>
>  emacs/notmuch-hello.el | 21 ++++++++++++++++-----
>  emacs/notmuch-jump.el  |  4 +++-
>  emacs/notmuch-tree.el  |  8 ++++++++
>  3 files changed, 27 insertions(+), 6 deletions(-)
>
> -- 
> 2.1.4
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH 1/2] emacs: allow saved searches to select tree-view

[David Bremner]

Mark Walters <markwalters1009@gmail.com> writes:

> This patch allows the user to customize a saved search to choose tree
> view rather than the default search view. It also updates notmuch-jump
> so that it respects this choice.

pushed to master and release

Re: [PATCH 2/2] emacs: tree: bind S to run current query in search mode

[David Bremner]

Mark Walters <markwalters1009@gmail.com> writes:

> ---
>  emacs/notmuch-tree.el | 8 ++++++++
>  1 file changed, 8 insertions(+)

pushed to master and release

d