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

More

Browse source
This commit is contained in:
Adam Porter 2017-08-05 04:18:12 -05:00
parent 4202315283
commit 4f81c672ff
1 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

50
org-agenda-ng.el
View file

@ -1,3 +1,17 @@
;;; Commentary:
;;;; Principles
;;;;; Work on elements
;; We want to work on elements as returned by =org-element-parse-buffer=. We only convert to strings at the very end, when we send the list of those to =org-agenda-finalize-entries=.
;;;;; Preserve the call to =org-agenda-finalize-entries=
;; We want to preserve the final call to =org-agenda-finalize-entries= to preserve compatibility with other packages and functions.
;;; Code:
(require 'org) (require 'org)
(require 'org-agenda) (require 'org-agenda)
(require 'dash) (require 'dash)
@ -5,11 +19,11 @@
;;;; Commands ;;;; Commands
(defun org-agenda-ng--agenda (&key filter-fns) (cl-defun org-agenda-ng--agenda (&key match-fns)
(with-current-buffer (find-buffer-visiting "~/org/main.org") (with-current-buffer (find-buffer-visiting "~/org/main.org")
(let* ((tree (cddr (org-element-parse-buffer 'headline))) (let* ((tree (cddr (org-element-parse-buffer 'headline)))
(entries (--> (org-agenda-ng--filter-tree tree :filter-fns filter-fns) (entries (--> (org-agenda-ng--filter-tree tree :match-fns match-fns)
(mapcar #'org-agenda-ng--element-to-string it))) (mapcar #'org-agenda-ng--format-element it)))
(result-string (org-agenda-finalize-entries entries 'agenda)) (result-string (org-agenda-finalize-entries entries 'agenda))
(target-buffer (get-buffer-create "test-agenda-ng"))) (target-buffer (get-buffer-create "test-agenda-ng")))
(with-current-buffer target-buffer (with-current-buffer target-buffer
@ -22,17 +36,17 @@
(defun org-agenda-ng--test-agenda () (defun org-agenda-ng--test-agenda ()
(interactive) (interactive)
(org-agenda-ng--agenda (org-agenda-ng--agenda
:filter-fns '((org-agenda-ng--todo-p "TODO") :match-fns '((org-agenda-ng--todo-p "TODO")
(org-agenda-ng--date-p :deadline < "2017-08-05")))) (org-agenda-ng--date-p :deadline < "2017-08-05"))))
(defun org-agenda-ng--todo-list () (defun org-agenda-ng--todo-list ()
(interactive) (interactive)
(org-agenda-ng--agenda (org-agenda-ng--agenda
:filter-fns '((org-agenda-ng--todo-p "TODO")))) :match-fns '((org-agenda-ng--todo-p "TODO"))))
;;;; Functions ;;;; Functions
(defun org-agenda-ng--filter-tree (tree &key filter-fns) (defun org-agenda-ng--filter-tree (tree &key match-fns)
(let* ((types '(headline)) (let* ((types '(headline))
(info nil) (info nil)
(first-match nil) (first-match nil)
@ -40,13 +54,16 @@
(when (--all? (cl-typecase it (when (--all? (cl-typecase it
(function (funcall it element)) (function (funcall it element))
(cons (apply (car it) element (cdr it)))) (cons (apply (car it) element (cdr it))))
filter-fns) match-fns)
element)))) element))))
(org-element-map tree types fun info first-match))) (org-element-map tree types fun info first-match)))
;;;; Faces/properties ;;;; Faces/properties
(defun org-agenda-ng--element-to-string (element) (defun org-agenda-ng--format-element (element)
;; This essentially needs to do what `org-agenda-format-item' does,
;; which is a lot.
"Return ELEMENT as a string with its text-properties set according to its property list. "Return ELEMENT as a string with its text-properties set according to its property list.
Its property list should be the second item in the list, as returned by `org-element-parse-buffer'." Its property list should be the second item in the list, as returned by `org-element-parse-buffer'."
(let* ((properties (second element)) (let* ((properties (second element))
@ -63,13 +80,16 @@ Its property list should be the second item in the list, as returned by `org-ele
(title (--> (org-agenda-ng--add-faces element) (title (--> (org-agenda-ng--add-faces element)
(org-element-property :title it) (org-element-property :title it)
(org-link-display-format it))) (org-link-display-format it)))
(todo-keyword (--> (org-element-property :todo-keyword element) (todo-keyword (-some--> (org-element-property :todo-keyword element)
(org-agenda-ng--add-todo-face it))) (org-agenda-ng--add-todo-face it)))
(tags (--> (org-element-property :tags element) (tags (-some--> (org-element-property :tags element)
(s-join ":" it) (s-join ":" it)
(s-wrap it ":") (s-wrap it ":")
(org-add-props it nil 'face 'org-tag))) (org-add-props it nil 'face 'org-tag)))
(level (org-element-property :level element))
(category (org-element-property :category element))
(string (s-join " " (list todo-keyword title tags)))) (string (s-join " " (list todo-keyword title tags))))
(remove-list-of-text-properties 0 (length string) '(line-prefix) string)
;; Add all the necessary properties and faces to the whole string ;; Add all the necessary properties and faces to the whole string
(--> string (--> string
(org-add-props it properties)))) (org-add-props it properties))))