jiri/org-ql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change: (org-ql-agenda--agenda) Also accept strings

Browse source 
This allows the strings to be provided from another function, enabling
features such as a "timeline" view (coming soon...).
This commit is contained in:
Adam Porter 2019-08-30 23:59:26 -05:00
parent 077b7000cf
commit 65125a695f
1 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

35
org-ql-agenda.el
View file

@ -316,30 +316,35 @@ TYPE may be `ts', `ts-active', `ts-inactive', `clocked', or
;; TODO: Move the action-fn down into --filter-buffer, so users can avoid calling the ;; TODO: Move the action-fn down into --filter-buffer, so users can avoid calling the
;; headline-parser when they don't need it. ;; headline-parser when they don't need it.
(cl-defun org-ql-agenda--agenda (buffers-files query &key entries sort buffer narrow super-groups title) (cl-defun org-ql-agenda--agenda (buffers-files query &key entries strings sort buffer narrow super-groups title)
"FIXME: Docstring" "FIXME: Docstring"
;; TODO: Rename `entries' to `elements'.
(declare (indent defun)) (declare (indent defun))
(when (and super-groups (not org-super-agenda-mode)) (when (and super-groups (not org-super-agenda-mode))
(user-error "`org-super-agenda-mode' must be activated to use grouping")) (user-error "`org-super-agenda-mode' must be activated to use grouping"))
(when (and entries strings)
(user-error "Only one of ENTRIES or STRINGS may be provided"))
(let* ((org-super-agenda-groups super-groups) (let* ((org-super-agenda-groups super-groups)
(entries (or entries
(--> (org-ql-select buffers-files
query
:sort sort
:narrow narrow
:action (lambda ()
(->> (org-element-headline-parser (line-end-position))
org-ql--add-markers))))))
(string (--> entries
(mapcar #'org-ql-agenda--format-element it)
(cond ((bound-and-true-p org-super-agenda-mode) (org-super-agenda--group-items it))
(t it))
(s-join "\n" it)))
(buffer (cl-etypecase buffer (buffer (cl-etypecase buffer
(string (org-ql-agenda--buffer buffer)) (string (org-ql-agenda--buffer buffer))
(null (org-ql-agenda--buffer buffer)) (null (org-ql-agenda--buffer buffer))
(buffer buffer))) (buffer buffer)))
(inhibit-read-only t)) (inhibit-read-only t)
string)
(cond (entries)
(strings (setf string (s-join "\n" strings)))
(query (setf entries (org-ql-select buffers-files
query
:sort sort
:narrow narrow
:action 'element-with-markers)))
(t (user-error "One of QUERY, ENTRIES, or STRINGS must be provided")))
(unless string
(setf string (--> entries
(mapcar #'org-ql-agenda--format-element it)
(cond ((bound-and-true-p org-super-agenda-mode) (org-super-agenda--group-items it))
(t it))
(s-join "\n" it))))
(with-current-buffer buffer (with-current-buffer buffer
(use-local-map org-ql-view-map) (use-local-map org-ql-view-map)
;; Prepare buffer, saving data for refreshing. ;; Prepare buffer, saving data for refreshing.