1 files changed, 58 insertions, 57 deletions
diff --git a/lisp/+elfeed.el b/lisp/+elfeed.el
index b2a578b..82db471 100644
--- a/lisp/+elfeed.el
+++ b/lisp/+elfeed.el

@@ -40,63 +40,64 @@
 (defun +elfeed-update-command ()
  (interactive)
-  (let ((script (expand-file-name "~/.local/bin/elfeed"))
+  (let ((script (expand-file-name "~/.local/bin/elfeed-update.el"))
-        (update-message-format "[Elfeed] Updating in the background...%s"))
+        (update-message-format "[Elfeed] Updating in the background..."))
-    (message update-message-format "")
+    (with-temp-message update-message-format
-    (setq +elfeed--update-running t)
+      (setq +elfeed--update-running t)
-    (elfeed-db-save)
+      (elfeed-db-save)
-    (advice-add 'elfeed :override #'+elfeed--update-message)
+      (advice-add 'elfeed :override #'+elfeed--update-message)
-    (ignore-errors (kill-buffer "*elfeed-search*"))
+      (ignore-errors (kill-buffer "*elfeed-search*"))
-    (ignore-errors (kill-buffer "*elfeed-log*"))
+      (ignore-errors (kill-buffer "*elfeed-log*"))
-    (elfeed-db-unload)
+      (elfeed-db-unload)
-    (unless (file-exists-p script)
+      (unless (file-exists-p script)
-      (make-directory (file-name-directory script) :parents)
+        (make-directory (file-name-directory script) :parents)
-      (with-temp-buffer
+        (with-temp-buffer
-        (insert
+          (insert
-         (nconcat nil
+           (nconcat nil
-           "#!/usr/bin/env -S emacs --script"
+             "#!/usr/bin/env -S emacs --script"
-           ;; I have to load the necessary files
+             "(setq lexical-binding t)"
-           "(load (locate-user-emacs-file \"early-init\"))"
+             ;; I have to load the necessary files
-           "(straight-use-package 'elfeed)"
+             "(load (locate-user-emacs-file \"early-init\"))"
-           "(straight-use-package 'elfeed-org)"
+             "(straight-use-package 'elfeed)"
-           "(require 'elfeed)"
+             "(straight-use-package 'elfeed-org)"
-           "(require 'elfeed-org)"
+             "(require 'elfeed)"
-           ;; And set needed variables
+             "(require 'elfeed-org)"
-           `("(setq rmh-elfeed-org-files '("
+             ;; And set needed variables
-             ,(mapconcat (lambda (el)
+             `("(setq rmh-elfeed-org-files '("
-                           (format "\"%s\"" el))
+               ,(mapconcat (lambda (el)
-                         rmh-elfeed-org-files
+                             (format "\"%s\"" el))
-                         " ")
+                           rmh-elfeed-org-files
-             "))")
+                           " ")
-           ;; Overwrite log function to go to stdout
+               "))")
-           "(defun elfeed-log (level fmt &rest objects)"
+             ;; Overwrite log function to go to stdout
-           "  (princ (format \"[%s] [%s]: %s\\n\""
+             "(defun elfeed-log (level fmt &rest objects)"
-           "                 (format-time-string \"%F %T\")"
+             "  (princ (format \"[%s] [%s]: %s\\n\""
-           "                 level"
+             "                 (format-time-string \"%F %T\")"
-           "                 (apply #'format fmt objects))))"
+             "                 level"
-           ;; Load elfeed
+             "                 (apply #'format fmt objects))))"
-           "(elfeed-org)"
+             ;; Load elfeed
-           "(elfeed-db-load)"
+             "(elfeed-org)"
-           "(elfeed)"
+             "(elfeed-db-load)"
-           ;; Update elfeed
+             "(elfeed)"
-           "(elfeed-update)"
+             ;; Update elfeed
-           ;; Wait to finish ... I think.
+             "(elfeed-update)"
-           "(while (> (elfeed-queue-count-total) 0)"
+             ;; Wait to finish ... I think.
-           "  (sleep-for 5)"
+             "(while (> (elfeed-queue-count-total) 0)"
-           "  (message \"%s\" (elfeed-queue-count-total))"
+             "  (sleep-for 5)"
-           "  (accept-process-output))"
+             "  (message \"%s\" (elfeed-queue-count-total))"
-           ;; Save and garbage-collect
+             "  (accept-process-output))"
-           "(elfeed-db-save)"
+             ;; Save and garbage-collect
-           "(elfeed-db-gc)"))
+             "(elfeed-db-save)"
-        (write-file script))
+             "(elfeed-db-gc)"))
-      (chmod script #o777))
+          (write-file script))
-    (set-process-sentinel (start-process-shell-command
+        (chmod script #o777))
-                           "Elfeed" nil script)
+      (set-process-sentinel (start-process-shell-command
-                          (lambda (a b)
+                             "Elfeed" nil script)
-                            (advice-remove 'elfeed #'+elfeed--update-message)
+                            (lambda (a b)
-                            (setq +elfeed--update-running nil)
+                              (advice-remove 'elfeed #'+elfeed--update-message)
-                            (message update-message-format
+                              (setq +elfeed--update-running nil)
-                                     (string-trim b))))))
+                              (message update-message-format
+                                       (string-trim b)))))))
 (defvar +elfeed--update-timer nil "Timer for `elfeed-update-command'.")
 (defvar +elfeed--update-first-time 6 "How long to wait for the first time.")

diff --git a/lisp/+elfeed.el b/lisp/+elfeed.el index b2a578b..82db471 100644 --- a/lisp/+elfeed.el +++ b/lisp/+elfeed.el
@@ -40,63 +40,64 @@
40		40
41	(defun +elfeed-update-command ()	41	(defun +elfeed-update-command ()
42	(interactive)	42	(interactive)
43	(let ((script (expand-file-name "~/.local/bin/elfeed"))	43	(let ((script (expand-file-name "~/.local/bin/elfeed-update.el"))
44	(update-message-format "[Elfeed] Updating in the background...%s"))	44	(update-message-format "[Elfeed] Updating in the background..."))
45	(message update-message-format "")	45	(with-temp-message update-message-format
46	(setq +elfeed--update-running t)	46	(setq +elfeed--update-running t)
47	(elfeed-db-save)	47	(elfeed-db-save)
48	(advice-add 'elfeed :override #'+elfeed--update-message)	48	(advice-add 'elfeed :override #'+elfeed--update-message)
49	(ignore-errors (kill-buffer "elfeed-search"))	49	(ignore-errors (kill-buffer "elfeed-search"))
50	(ignore-errors (kill-buffer "elfeed-log"))	50	(ignore-errors (kill-buffer "elfeed-log"))
51	(elfeed-db-unload)	51	(elfeed-db-unload)
52	(unless (file-exists-p script)	52	(unless (file-exists-p script)
53	(make-directory (file-name-directory script) :parents)	53	(make-directory (file-name-directory script) :parents)
54	(with-temp-buffer	54	(with-temp-buffer
55	(insert	55	(insert
56	(nconcat nil	56	(nconcat nil
57	"#!/usr/bin/env -S emacs --script"	57	"#!/usr/bin/env -S emacs --script"
58	;; I have to load the necessary files	58	"(setq lexical-binding t)"
59	"(load (locate-user-emacs-file \"early-init\"))"	59	;; I have to load the necessary files
60	"(straight-use-package 'elfeed)"	60	"(load (locate-user-emacs-file \"early-init\"))"
61	"(straight-use-package 'elfeed-org)"	61	"(straight-use-package 'elfeed)"
62	"(require 'elfeed)"	62	"(straight-use-package 'elfeed-org)"
63	"(require 'elfeed-org)"	63	"(require 'elfeed)"
64	;; And set needed variables	64	"(require 'elfeed-org)"
65	`("(setq rmh-elfeed-org-files '("	65	;; And set needed variables
66	,(mapconcat (lambda (el)	66	`("(setq rmh-elfeed-org-files '("
67	(format "\"%s\"" el))	67	,(mapconcat (lambda (el)
68	rmh-elfeed-org-files	68	(format "\"%s\"" el))
69	" ")	69	rmh-elfeed-org-files
70	"))")	70	" ")
71	;; Overwrite log function to go to stdout	71	"))")
72	"(defun elfeed-log (level fmt &rest objects)"	72	;; Overwrite log function to go to stdout
73	" (princ (format \"[%s] [%s]: %s\\n\""	73	"(defun elfeed-log (level fmt &rest objects)"
74	" (format-time-string \"%F %T\")"	74	" (princ (format \"[%s] [%s]: %s\\n\""
75	" level"	75	" (format-time-string \"%F %T\")"
76	" (apply #'format fmt objects))))"	76	" level"
77	;; Load elfeed	77	" (apply #'format fmt objects))))"
78	"(elfeed-org)"	78	;; Load elfeed
79	"(elfeed-db-load)"	79	"(elfeed-org)"
80	"(elfeed)"	80	"(elfeed-db-load)"
81	;; Update elfeed	81	"(elfeed)"
82	"(elfeed-update)"	82	;; Update elfeed
83	;; Wait to finish ... I think.	83	"(elfeed-update)"
84	"(while (> (elfeed-queue-count-total) 0)"	84	;; Wait to finish ... I think.
85	" (sleep-for 5)"	85	"(while (> (elfeed-queue-count-total) 0)"
86	" (message \"%s\" (elfeed-queue-count-total))"	86	" (sleep-for 5)"
87	" (accept-process-output))"	87	" (message \"%s\" (elfeed-queue-count-total))"
88	;; Save and garbage-collect	88	" (accept-process-output))"
89	"(elfeed-db-save)"	89	;; Save and garbage-collect
90	"(elfeed-db-gc)"))	90	"(elfeed-db-save)"
91	(write-file script))	91	"(elfeed-db-gc)"))
92	(chmod script #o777))	92	(write-file script))
93	(set-process-sentinel (start-process-shell-command	93	(chmod script #o777))
94	"Elfeed" nil script)	94	(set-process-sentinel (start-process-shell-command
95	(lambda (a b)	95	"Elfeed" nil script)
96	(advice-remove 'elfeed #'+elfeed--update-message)	96	(lambda (a b)
97	(setq +elfeed--update-running nil)	97	(advice-remove 'elfeed #'+elfeed--update-message)
98	(message update-message-format	98	(setq +elfeed--update-running nil)
99	(string-trim b))))))	99	(message update-message-format
		100	(string-trim b)))))))
100		101
101	(defvar +elfeed--update-timer nil "Timer for `elfeed-update-command'.")	102	(defvar +elfeed--update-timer nil "Timer for `elfeed-update-command'.")
102	(defvar +elfeed--update-first-time 6 "How long to wait for the first time.")	103	(defvar +elfeed--update-first-time 6 "How long to wait for the first time.")