ndwarshuis
/
emacs-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH store filetags directly in the dag

This commit is contained in:
Nathan Dwarshuis 2022-02-20 10:56:01 -05:00
parent b5a19fcff3
commit 72eeac0225
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
local/lib/org-x/org-x-dag.el
View File

@ -950,16 +950,12 @@ valid keyword or none of its parents have valid keywords."
;; if its parent has a keyword or none of its parents have keywords ;; if its parent has a keyword or none of its parents have keywords
(when (and has-todo (or this-parent-key (--none-p (nth 1 it) cur-path)) (when (and has-todo (or this-parent-key (--none-p (nth 1 it) cur-path))
(setq this-key (org-x-dag-get-local-property "ID"))) (setq this-key (org-x-dag-get-local-property "ID")))
;; If parent is not a todo and we want tag inheritance, store all tags ;; If parent is not a todo and we want tag inheritance, store all
;; above this headline (sans file-tags which we can get later easily) ;; tags above this headline (including file tags)
;; (org-entry-get nil org-x-prop-parent-type) (setq all-tags (if (and (not this-parent-key) org-use-tag-inheritance)
;; TODO add the file tags here so I don't need to worry about them
;; later
(setq all-tags (if (and (not this-parent-key)
org-use-tag-inheritance)
(->> cur-path (->> cur-path
(--mapcat (nth 2 it)) (--mapcat (nth 2 it))
(append this-tags)) (append this-tags org-file-tags))
this-tags) this-tags)
this-links (or (org-x-dag-get-parent-links) this-links (or (org-x-dag-get-parent-links)
;;(org-x-dag-get-link-property) ;;(org-x-dag-get-link-property)
@ -1680,7 +1676,7 @@ FUTURE-LIMIT in a list."
'x-priority priority)))))) 'x-priority priority))))))
(format-key (format-key
(cat key) (cat key)
(let ((tags (org-x-dag-id->tags t org-file-tags key))) (let ((tags (org-x-dag-id->tags t nil key)))
;; TODO don't hardcode these things ;; TODO don't hardcode these things
(org-x-dag-with-id key (org-x-dag-with-id key
(unless (or (member org-x-tag-incubated tags) (unless (or (member org-x-tag-incubated tags)
@ -1704,7 +1700,7 @@ FUTURE-LIMIT in a list."
'x-status status)))))) 'x-status status))))))
(org-x-dag-with-files (org-x-get-action-files) (org-x-dag-with-files (org-x-get-action-files)
(org-x-dag-id->is-toplevel-p it) (org-x-dag-id->is-toplevel-p it)
(let ((tags (org-x-dag-id->tags t org-file-tags it))) (let ((tags (org-x-dag-id->tags t nil it)))
(unless (member org-x-tag-incubated tags) (unless (member org-x-tag-incubated tags)
(org-x-dag-with-id it (org-x-dag-with-id it
(when (org-x-dag-headline-is-iterator-p) (when (org-x-dag-headline-is-iterator-p)
@ -1725,11 +1721,12 @@ FUTURE-LIMIT in a list."
(-some-> (org-x-dag-id->headline-children id) (-some-> (org-x-dag-id->headline-children id)
(descend)))) (descend))))
;; TODO this includes tasks underneath cancelled headlines
(defun org-x-dag-scan-tasks () (defun org-x-dag-scan-tasks ()
(cl-flet (cl-flet
((format-key ((format-key
(category is-standalone key) (category is-standalone key)
(let ((tags (org-x-dag-id->tags t org-file-tags key))) (let ((tags (org-x-dag-id->tags t nil key)))
;; filter out incubators ;; filter out incubators
(org-x-dag-with-id key (org-x-dag-with-id key
(unless (or (member org-x-tag-incubated tags) (unless (or (member org-x-tag-incubated tags)
@ -1776,7 +1773,7 @@ FUTURE-LIMIT in a list."
(cl-flet (cl-flet
((format-key ((format-key
(category key) (category key)
(let ((tags (org-x-dag-id->tags t org-file-tags key))) (let ((tags (org-x-dag-id->tags t nil key)))
(when (member org-x-tag-incubated tags) (when (member org-x-tag-incubated tags)
(org-x-dag-with-id key (org-x-dag-with-id key
(let* ((sch (org-x-dag-headline-is-scheduled-p t)) (let* ((sch (org-x-dag-headline-is-scheduled-p t))
@ -1796,7 +1793,7 @@ FUTURE-LIMIT in a list."
(cl-flet (cl-flet
((format-key ((format-key
(category key) (category key)
(let ((tags (org-x-dag-id->tags t org-file-tags key))) (let ((tags (org-x-dag-id->tags t nil key)))
(unless (member org-x-tag-incubated tags) (unless (member org-x-tag-incubated tags)
(org-x-dag-with-id key (org-x-dag-with-id key
(-let (((is-archivable is-project) (-let (((is-archivable is-project)
@ -1900,7 +1897,7 @@ FUTURE-LIMIT in a list."
((format-timestamps ((format-timestamps
(todayp sel-date cat id pts get-datetimes-fun format-datetime-fun) (todayp sel-date cat id pts get-datetimes-fun format-datetime-fun)
(-when-let (datetimes (funcall get-datetimes-fun sel-date pts)) (-when-let (datetimes (funcall get-datetimes-fun sel-date pts))
(let ((tags (org-x-dag-id->tags t org-file-tags id))) (let ((tags (org-x-dag-id->tags t nil id)))
(unless (member org-x-tag-incubated tags) (unless (member org-x-tag-incubated tags)
(-let (((&plist :pos) pts) (-let (((&plist :pos) pts)
(donep (org-x-dag-id->is-done-p id))) (donep (org-x-dag-id->is-done-p id)))