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

Add: (org-ql-agenda--agenda) Optionally specify entries directly

Browse source 
Should probably refactor this a bit more, but this is useful now.
This commit is contained in:
Adam Porter 2019-08-08 10:36:57 -05:00
parent 43545482a4
commit 7829238988
2 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
org-ql-agenda.el
View file

@ -201,23 +201,25 @@ SORT: One or a list of `org-ql' sorting functions, like `date' or
;; TODO: Move the action-fn down into --filter-buffer, so users can avoid calling the
;; headline-parser when they don't need it.
(cl-defun org-ql-agenda--agenda (buffers-files query &key sort buffer narrow super-groups)
(cl-defun org-ql-agenda--agenda (buffers-files query &key entries sort buffer narrow super-groups)
"FIXME: Docstring"
(declare (indent defun))
(when (and super-groups (not org-super-agenda-mode))
(user-error "`org-super-agenda-mode' must be activated to use grouping"))
(let* ((org-super-agenda-groups super-groups)
(entries (--> (org-ql-select buffers-files
query
:sort sort
:narrow narrow
:action (lambda ()
(->> (org-element-headline-parser (line-end-position))
org-ql--add-markers)))
(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)))
(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
(string (org-ql-agenda--buffer buffer))
(null (org-ql-agenda--buffer buffer))
@ -236,7 +238,7 @@ SORT: One or a list of `org-ql' sorting functions, like `date' or
(setq-local header-line-format (org-ql-agenda--header-line-format buffers-files query))
;; Clear buffer, insert entries, etc.
(erase-buffer)
(insert entries)
(insert string)
(pop-to-buffer (current-buffer))
(org-agenda-finalize)
(goto-char (point-min)))))