gnus demon simplifications

1 files changed, 15 insertions, 17 deletions

diff --git a/gnus.org b/gnus.org
index d68c040..c4afb8e 100644
--- a/gnus.org
+++ b/gnus.org
@@ -293,10 +293,6 @@
   #+begin_src emacs-lisp
     (setq mail-user-agent 'gnus-user-agent)
 
-    (require 'gnus-demon)
-    (gnus-demon-add-handler 'gnus-demon-scan-news 5 1)
-    ;; (gnus-demon-remove-handler 'gnus-demon-scan-news)
-
     ;; synchronicity
     (setq gnus-asynchronous t)
     ;;; prefetch as many articles as possible
@@ -346,22 +342,24 @@
                              jao-gnus-tracked-groups))))
 
     (defun jao-gnus--notify ()
-      (let ((inhibit-message t))
-        (shell-command-to-string "index-mail.sh")
-        (setq jao-gnus--notify-strs (jao-gnus--notify-strs))
-        (save-window-excursion (jao-minibuffer-refresh))))
+      (setq jao-gnus--notify-strs (jao-gnus--notify-strs))
+      (save-window-excursion (jao-minibuffer-refresh)))
 
-    (add-hook 'gnus-after-getting-new-news-hook #'jao-gnus--notify)
-    (add-hook 'gnus-started-hook #'jao-gnus--notify)
+    (defun jao-gnus-scan ()
+      (interactive)
+      (let ((inhibit-message t))
+        (gnus-demon-scan-mail)
+        (shell-command "index-mail.sh")
+        (save-window-excursion )
+        (jao-gnus--notify)))
 
-    (defun jao-gnus--summary-done ()
-        (let ((inhibit-message t)
-              (message-log-max nil))
-          (save-window-excursion
-            (jao-gnus--notify)
-            (org-agenda-list))))
+    (require 'gnus-demon)
+    (gnus-demon-add-handler 'jao-gnus-scan 5 5)
+    ;; (gnus-demon-remove-handler 'jao-gnus-scan)
 
-    (add-hook 'gnus-summary-exit-hook #'jao-gnus--summary-done)
+    (add-hook 'gnus-started-hook #'jao-gnus-scan)
+    (add-hook 'gnus-summary-exit-hook #'jao-gnus--notify)
+    (add-hook 'gnus-summary-exit-hook #'org-agenda-list)
 
     (with-eval-after-load "jao-minibuffer"
       (jao-minibuffer-add-variable 'jao-gnus--notify-strs -20))