gnus: fixes for notmuch thread search

1 files changed, 25 insertions, 1 deletions

diff --git a/lib/net/jao-notmuch-gnus.el b/lib/net/jao-notmuch-gnus.el
index 3abfaee..aa63d7c 100644
--- a/lib/net/jao-notmuch-gnus.el
+++ b/lib/net/jao-notmuch-gnus.el
@@ -110,8 +110,32 @@
 
 (add-to-list 'gnus-search-expandable-keys "list")
 
-(cl-defmethod gnus-search-transform-expression ((engine gnus-search-notmuch)
+(defclass gnus-search-jao-notmuch (gnus-search-notmuch) ())
+
+(cl-defmethod gnus-search-indexed-search-command
+  ((engine gnus-search-jao-notmuch) (qstring string) query &optional groups)
+  (let* ((limit (alist-get 'limit query))
+         (thread (alist-get 'thread query))
+         (qs (cond (thread
+                    (format "thread:\"{%s}\""
+                            (thread-last (string-replace "\"" "\"\"" qstring)
+                                         (string-replace "<" "")
+                                         (string-replace ">" ""))))
+                   (groups
+                    (let ((gs (mapconcat 'gnus-group-short-name groups "|")))
+                      (format "(%s) and folder:/%s/" qstring gs)))
+                   (t qstring))))
+    (with-slots (switches config-file) engine
+      `(,(format "--config=%s" config-file) "search" "--output=files"
+        ,@(unless thread '("--duplicate=1"))
+        ,@(when limit (list (format "--limit=%d" limit)))
+        ,@switches
+        ,qs))))
+
+
+(cl-defmethod gnus-search-transform-expression ((engine gnus-search-jao-notmuch)
                                                 (expr (head list)))
+  (message "List query: %s" expr)
   (format "List:%s" (gnus-search-transform-expression engine (cdr expr))))