2022-01-15 00:41:11 -05:00
|
|
|
;;; org-x-dag.el --- Org-in-a-DAG -*- lexical-binding: t; -*-
|
|
|
|
|
|
|
|
;; Copyright (C) 2022 Nathan Dwarshuis
|
|
|
|
|
|
|
|
;; This program is free software; you can redistribute it and/or modify
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
;; This program is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; Welcome to Dagestan, you will be smeshed...
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
;; TODO this depends on other stuff in org-x like the file and id operations
|
|
|
|
(require 'org)
|
|
|
|
(require 'org-ml)
|
|
|
|
(require 'dash)
|
|
|
|
(require 'dag)
|
|
|
|
(require 'ht)
|
|
|
|
|
|
|
|
;;; GLOBAL STATE
|
|
|
|
|
|
|
|
;; variables to store state
|
|
|
|
|
2022-01-22 18:05:07 -05:00
|
|
|
(defun org-x-dag-create (d m f)
|
|
|
|
(list :dag d :id->meta m :file->ids f))
|
|
|
|
|
|
|
|
(defun org-x-dag-empty ()
|
|
|
|
(org-x-dag-create (dag-empty) (ht-create #'equal) (ht-create #'equal)))
|
|
|
|
|
|
|
|
(defvar org-x-dag (org-x-dag-empty)
|
|
|
|
|
2022-01-15 00:41:11 -05:00
|
|
|
"The org-x DAG.
|
|
|
|
|
|
|
|
Each node in this DAG represents a headline with the following
|
|
|
|
characteristics:
|
|
|
|
- contained in a file as given by `org-x-dag-get-files'
|
|
|
|
- has a keyword
|
|
|
|
- either has an immediate parent with a keyword or has no parents
|
|
|
|
with keywords
|
|
|
|
|
|
|
|
Each node is represented by a key, which is either a string
|
|
|
|
representing the headlines's ID property or a cons cell
|
|
|
|
like (FILE POS) representing the staring position in file/buffer
|
|
|
|
of the headline (aka a \"pseudo-marker\").")
|
|
|
|
|
|
|
|
(defvar org-x-dag-sync-state nil
|
|
|
|
"An alist representing the sync state of the DAG.
|
|
|
|
|
|
|
|
The car of each cell is the file path, and the cdr is the md5 of
|
|
|
|
that file as it currently sits on disk.")
|
|
|
|
|
|
|
|
;; functions to construct nodes within state
|
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
(defun org-x-dag-build-meta (file point level todo tags parent)
|
2022-01-15 00:41:11 -05:00
|
|
|
(list :file file
|
|
|
|
:point point
|
|
|
|
:level level
|
|
|
|
:todo todo
|
|
|
|
:tags tags
|
2022-01-23 20:05:08 -05:00
|
|
|
:buffer-parent parent))
|
2022-01-15 00:41:11 -05:00
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
;; state lookup functions
|
|
|
|
;;
|
|
|
|
;; all functions with `org-x-dag->' or `org-x-dag-id->' depend on the value of
|
|
|
|
;; `org-x-dag'
|
2022-01-22 18:05:07 -05:00
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
(defun org-x-dag->metatable ()
|
|
|
|
(plist-get org-x-dag :id->meta))
|
2022-01-15 00:41:11 -05:00
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
(defun org-x-dag->dag ()
|
|
|
|
(plist-get org-x-dag :dag))
|
2022-01-15 00:41:11 -05:00
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
(defun org-x-dag->adjacency-list ()
|
|
|
|
(dag-get-adjacency-list (org-x-dag->dag)))
|
2022-01-15 00:41:11 -05:00
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
(defun org-x-dag-id->metaprop (id prop)
|
|
|
|
(-> (org-x-dag->metatable)
|
|
|
|
(ht-get id)
|
|
|
|
(plist-get prop)))
|
2022-01-15 00:41:11 -05:00
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
(defun org-x-dag-id->file (id)
|
|
|
|
"Return file for ID."
|
|
|
|
(org-x-dag-id->metaprop id :file))
|
2022-01-15 00:41:11 -05:00
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
(defun org-x-dag-id->point (id)
|
|
|
|
"Return point for ID."
|
|
|
|
(org-x-dag-id->metaprop id :point))
|
2022-01-15 00:41:11 -05:00
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
(defun org-x-dag-id->todo (id)
|
|
|
|
"Return todo keyword for ID."
|
|
|
|
(org-x-dag-id->metaprop id :todo))
|
2022-01-15 00:41:11 -05:00
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
(defun org-x-dag-id->local-tags (id)
|
|
|
|
"Return local tags for ID."
|
|
|
|
(org-x-dag-id->metaprop id :tags))
|
|
|
|
|
|
|
|
(defun org-x-dag-id->is-done-p (id)
|
|
|
|
"Return t if ID has done keywords."
|
|
|
|
(member (org-x-dag-id->todo id) org-x-done-keywords))
|
|
|
|
|
|
|
|
(defun org-x-dag-id->is-floating-p (id)
|
|
|
|
(-> (plist-get org-x-dag :dag)
|
|
|
|
(dag-get-floating-nodes)
|
|
|
|
(ht-get id)))
|
|
|
|
|
|
|
|
(defun org-x-dag-id->is-toplevel-p (id)
|
|
|
|
(or (not (org-x-dag-id->metaprop id :buffer-parent))
|
|
|
|
;; TODO pretty sure this will never be used
|
|
|
|
(org-x-dag-id->is-floating-p id)))
|
|
|
|
|
|
|
|
(defun org-x-dag-id->tags (inherit? init id)
|
|
|
|
(cl-labels
|
|
|
|
((ascend
|
|
|
|
(id tags)
|
|
|
|
(-if-let (parent (org-x-dag-id->metaprop id :buffer-parent))
|
|
|
|
;; tags in the front of the list have precedence over latter tags,
|
|
|
|
;; so putting parent tags at the end means child tags have
|
|
|
|
;; precedence
|
|
|
|
(->> (org-x-dag-id->local-tags parent)
|
|
|
|
(append tags)
|
|
|
|
(ascend parent))
|
|
|
|
tags)))
|
|
|
|
;; likewise, init tags have the lowest precedence (the likely use case for
|
|
|
|
;; this argument is for file tags)
|
2022-01-23 20:28:22 -05:00
|
|
|
(let ((local-tags (org-x-dag-id->local-tags id))
|
|
|
|
(parent-tags (and inherit? (ascend id nil))))
|
|
|
|
(append local-tags parent-tags init))))
|
2022-01-23 20:05:08 -05:00
|
|
|
|
2022-01-23 23:05:20 -05:00
|
|
|
(defun org-x-dag-id->parents (id)
|
|
|
|
(->> (plist-get org-x-dag :dag)
|
|
|
|
(dag-get-parents id)))
|
|
|
|
|
|
|
|
(defun org-x-dag-id->children (id)
|
2022-01-23 20:05:08 -05:00
|
|
|
(->> (plist-get org-x-dag :dag)
|
2022-01-23 23:05:20 -05:00
|
|
|
(dag-get-children id)))
|
|
|
|
|
|
|
|
(defun org-x-dag-id->headline-children (id)
|
|
|
|
(->> (org-x-dag-id->children id)
|
2022-01-23 20:05:08 -05:00
|
|
|
(--filter (equal (org-x-dag-id->metaprop it :buffer-parent) id))))
|
|
|
|
|
|
|
|
(defun org-x-dag-files->ids (files)
|
|
|
|
(let ((filemap (plist-get org-x-dag :file->ids)))
|
|
|
|
(--mapcat (ht-get filemap it) files)))
|
|
|
|
|
|
|
|
;;; BUFFER SCANNING
|
2022-01-22 18:05:07 -05:00
|
|
|
|
|
|
|
(defun org-x-dag-get-local-property (prop)
|
|
|
|
(car (org--property-local-values prop nil)))
|
|
|
|
|
|
|
|
(defun org-x-dag-get-link-property ()
|
|
|
|
(-some->> (org-x-dag-get-local-property org-x-prop-goal)
|
|
|
|
(s-split ";")
|
|
|
|
(--map (->> (s-trim it)
|
|
|
|
(s-match "^\\[\\[id:\\(.*\\)\\]\\[.*\\]\\]$")
|
|
|
|
(cadr)))))
|
|
|
|
|
2022-01-15 00:41:11 -05:00
|
|
|
(defun org-x-dag-get-buffer-nodes (file kws)
|
|
|
|
"Return a list of nodes from FILE.
|
|
|
|
|
|
|
|
A node will only be returned if the headline to which it points
|
|
|
|
has a valid (meaning in KWS) keyword and either its parent has a
|
|
|
|
valid keyword or none of its parents have valid keywords."
|
|
|
|
(let ((more t)
|
|
|
|
cur-path this-point this-key this-level this-todo has-todo this-parent
|
2022-02-04 18:59:37 -05:00
|
|
|
this-tags this-meta all-tags this-file-links this-links acc acc-meta
|
|
|
|
this-parent-key)
|
2022-01-15 00:41:11 -05:00
|
|
|
;; TODO add org-mode sanity check
|
|
|
|
(goto-char (point-min))
|
2022-01-22 18:05:07 -05:00
|
|
|
;; If not on a headline, check for a property drawer with links in it
|
|
|
|
(unless (= ?* (following-char))
|
|
|
|
(setq this-file-links (org-x-dag-get-link-property)))
|
2022-01-15 00:41:11 -05:00
|
|
|
;; move forward until on a headline
|
|
|
|
(while (and (not (= ?* (following-char))) (= 0 (forward-line 1))))
|
|
|
|
;; Build alist; Keep track of how 'deep' we are in a given org-tree using a
|
|
|
|
;; stack. The stack will have members like (LEVEL KEY) where LEVEL is the
|
|
|
|
;; level of the headline and KEY is the node key if it has a keyword. Only
|
|
|
|
;; add a node to the accumulator if it has a keyword, and only include its
|
|
|
|
;; parent headline if the parent also has a keyword (add the link targets
|
|
|
|
;; regardless).
|
|
|
|
(while more
|
|
|
|
(when (= ?* (following-char))
|
|
|
|
(setq this-point (point)
|
|
|
|
this-key nil)
|
2022-01-23 12:01:41 -05:00
|
|
|
;; TODO this might be optimizable
|
2022-01-15 00:41:11 -05:00
|
|
|
;; Get tags (must be done from the first column)
|
|
|
|
(setq this-tags (org--get-local-tags))
|
2022-01-23 12:01:41 -05:00
|
|
|
;; Get the level if the following char is a space (if it isn't this is
|
|
|
|
;; actually a bolded object that starts on the first column like
|
|
|
|
;; '*blabla*'
|
2022-01-15 00:41:11 -05:00
|
|
|
(while (= ?* (following-char)) (forward-char 1))
|
2022-01-23 12:01:41 -05:00
|
|
|
(when (= 32 (following-char))
|
|
|
|
(setq this-level (current-column))
|
|
|
|
;; Check if the headline has a keyword
|
|
|
|
(forward-char 1)
|
|
|
|
(while (not (memq (following-char) '(? ?\n))) (forward-char 1))
|
|
|
|
(setq this-todo (-> (+ 1 this-point this-level)
|
|
|
|
(buffer-substring (+ this-point (current-column))))
|
|
|
|
has-todo (member this-todo kws))
|
|
|
|
;; Adjust the stack so that the top headline is the parent of the
|
|
|
|
;; current headline
|
|
|
|
(while (and cur-path (<= this-level (nth 0 (car cur-path))))
|
|
|
|
(!cdr cur-path))
|
|
|
|
(setq this-parent (car cur-path)
|
2022-01-23 20:05:08 -05:00
|
|
|
this-parent-key (nth 1 this-parent))
|
2022-01-23 12:01:41 -05:00
|
|
|
;; Add the current headline to accumulator if it has a keyword, but only
|
|
|
|
;; if its parent has a keyword or none of its parents have keywords
|
2022-01-23 20:05:08 -05:00
|
|
|
(when (and has-todo (or this-parent-key (--none-p (nth 1 it) cur-path))
|
2022-01-23 12:01:41 -05:00
|
|
|
(setq this-key (org-x-dag-get-local-property "ID")))
|
|
|
|
;; If parent is not a todo and we want tag inheritance, store all tags
|
|
|
|
;; above this headline (sans file-tags which we can get later easily)
|
2022-01-23 20:05:08 -05:00
|
|
|
;; (org-entry-get nil org-x-prop-parent-type)
|
2022-02-04 18:59:37 -05:00
|
|
|
(setq all-tags (if (and (not this-parent-key)
|
|
|
|
org-use-tag-inheritance)
|
|
|
|
(->> cur-path
|
|
|
|
(--mapcat (nth 2 it))
|
|
|
|
(append this-tags))
|
|
|
|
this-tags)
|
|
|
|
this-links (or (org-x-dag-get-link-property)
|
|
|
|
(when (not this-parent-key) this-file-links))
|
2022-01-23 12:01:41 -05:00
|
|
|
this-meta (org-x-dag-build-meta file
|
|
|
|
this-point
|
|
|
|
this-level
|
|
|
|
(substring-no-properties this-todo)
|
2022-02-04 18:59:37 -05:00
|
|
|
all-tags
|
2022-01-23 20:05:08 -05:00
|
|
|
this-parent-key))
|
2022-01-23 12:01:41 -05:00
|
|
|
(!cons (cons this-key this-meta) acc-meta)
|
2022-02-04 18:59:37 -05:00
|
|
|
(!cons (cons this-key (append (list (nth 1 this-parent)) this-links))
|
2022-01-23 12:01:41 -05:00
|
|
|
acc))
|
|
|
|
;; Add current headline to stack
|
|
|
|
(!cons (list this-level this-key this-tags) cur-path)))
|
2022-01-15 00:41:11 -05:00
|
|
|
(setq more (= 0 (forward-line 1))))
|
2022-01-22 18:05:07 -05:00
|
|
|
;; TODO reverse these to make things make sense later?
|
|
|
|
(list acc acc-meta)))
|
2022-01-15 00:41:11 -05:00
|
|
|
|
|
|
|
(defun org-x-dag-get-file-nodes (file)
|
|
|
|
"Return all nodes in FILE in one pass."
|
|
|
|
(org-x-with-file file
|
|
|
|
(org-x-dag-get-buffer-nodes file org-todo-keywords-1)))
|
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
;;; DAG SYNCHRONIZATION/CONSTRUCTION
|
|
|
|
|
|
|
|
(defun org-x-dag-get-files ()
|
|
|
|
"Return a list of all files to be used in the DAG."
|
|
|
|
`(,(org-x-get-lifetime-goal-file)
|
|
|
|
,(org-x-get-endpoint-goal-file)
|
|
|
|
,@(org-x-get-action-and-incubator-files)))
|
|
|
|
|
|
|
|
(defun org-x-dag-get-md5 (path)
|
|
|
|
"Get the md5 checksum of PATH."
|
|
|
|
(org-x-with-file path (buffer-hash)))
|
|
|
|
|
|
|
|
(defun org-x-dag-get-sync-state ()
|
|
|
|
"Return the sync state.
|
|
|
|
|
|
|
|
The returned value will be a list like (TO-REMOVE TO-INSERT
|
|
|
|
TO-UPDATE) which will contain the file paths the should be
|
|
|
|
removed from, added to, or edited within the DAG respectively."
|
|
|
|
(cl-flet
|
|
|
|
((lookup-md5
|
|
|
|
(path)
|
|
|
|
(alist-get path org-x-dag-sync-state nil nil #'equal)))
|
|
|
|
(-let* ((existing-files (org-x-dag-get-files))
|
|
|
|
(state-files (-map #'car org-x-dag-sync-state))
|
|
|
|
(to-remove (-difference state-files existing-files))
|
|
|
|
((&alist 'to-insert 'to-update 'no-change)
|
|
|
|
(->> (--map (cons it (org-x-dag-get-md5 it)) existing-files)
|
|
|
|
(--group-by (-let* (((path . new-md5) it)
|
|
|
|
(old-md5 (lookup-md5 path)))
|
|
|
|
(cond
|
|
|
|
((null old-md5) 'to-insert)
|
|
|
|
((equal old-md5 new-md5) 'no-change)
|
|
|
|
(t 'to-update)))))))
|
|
|
|
(list to-remove to-insert to-update no-change))))
|
|
|
|
|
|
|
|
(defun org-x-dag-read-files (files)
|
2022-01-22 18:05:07 -05:00
|
|
|
(cl-flet
|
|
|
|
((append-results
|
|
|
|
(acc file)
|
|
|
|
(-let* (((acc-ids acc-meta acc-filemaps) acc)
|
|
|
|
((ids metas) (org-x-dag-get-file-nodes file))
|
|
|
|
(filemap (cons file (-map #'car ids))))
|
|
|
|
(list (append ids acc-ids)
|
|
|
|
(append metas acc-meta)
|
|
|
|
(cons filemap acc-filemaps)))))
|
|
|
|
(-reduce-from #'append-results nil files)))
|
|
|
|
|
|
|
|
(defun org-x-dag-update-ht (to-remove to-insert ht)
|
|
|
|
(--each to-remove
|
|
|
|
(ht-remove ht it))
|
|
|
|
(--each to-insert
|
2022-01-23 20:05:08 -05:00
|
|
|
(ht-set ht (car it) (cdr it))))
|
2022-01-22 18:05:07 -05:00
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
(defun org-x-dag-update-dag (to-insert to-remove)
|
|
|
|
(let* ((dag (org-x-dag->dag))
|
|
|
|
(dag* (if (dag-is-empty-p dag) (dag-alist-to-dag to-insert)
|
|
|
|
(dag-edit-nodes to-remove to-insert dag))))
|
|
|
|
(plist-put org-x-dag :dag dag*)))
|
2022-01-22 18:05:07 -05:00
|
|
|
|
2022-01-15 23:12:19 -05:00
|
|
|
;; TODO there is a HUGE DIFFERENCE between a 'key' (the things in the hash table
|
|
|
|
;; the look things up) and a 'node' (which is a cons cell, the car of which is a
|
|
|
|
;; 'key' and the cdr of which is a 'relation'). These names suck, but the point
|
|
|
|
;; is we need to distinguish between them otherwise really strange things happen
|
2022-01-15 00:41:11 -05:00
|
|
|
(defun org-x-dag-update (to-remove to-insert to-update)
|
|
|
|
"Update the DAG given files to add and remove.
|
|
|
|
|
|
|
|
TO-REMOVE, TO-INSERT, and TO-UPDATE are lists of files to remove
|
|
|
|
from, add to, and update with the DAG."
|
2022-01-23 20:05:08 -05:00
|
|
|
(-let* (((&plist :id->meta :file->ids) org-x-dag)
|
2022-01-22 18:05:07 -05:00
|
|
|
(files2rem (append to-update to-remove))
|
|
|
|
(files2ins (append to-update to-insert))
|
2022-01-23 20:05:08 -05:00
|
|
|
(ids2rem (org-x-dag-files->ids files2rem))
|
|
|
|
((ids2ins meta2ins fms2ins) (org-x-dag-read-files files2ins)))
|
2022-01-22 18:05:07 -05:00
|
|
|
(org-x-dag-update-ht ids2rem meta2ins id->meta)
|
|
|
|
(org-x-dag-update-ht files2rem fms2ins file->ids)
|
2022-01-23 20:05:08 -05:00
|
|
|
(org-x-dag-update-dag ids2ins ids2rem)))
|
2022-01-15 00:41:11 -05:00
|
|
|
|
|
|
|
(defun org-x-dag-sync (&optional force)
|
|
|
|
"Sync the DAG with files from `org-x-dag-get-files'.
|
|
|
|
|
|
|
|
If FORCE is non-nil, sync no matter what."
|
|
|
|
(when force
|
|
|
|
(setq org-x-dag-sync-state nil
|
2022-01-22 18:05:07 -05:00
|
|
|
org-x-dag (org-x-dag-empty)))
|
|
|
|
;; TODO verify integrity somewhere in here
|
|
|
|
(-let (((to-remove to-insert to-update no-change) (org-x-dag-get-sync-state)))
|
|
|
|
(org-x-dag-update to-remove (-map #'car to-insert) (-map #'car to-update))
|
|
|
|
(setq org-x-dag-sync-state (append to-insert to-update no-change))
|
2022-01-15 00:41:11 -05:00
|
|
|
nil))
|
|
|
|
|
|
|
|
;; NODE FORMATTING
|
|
|
|
|
2022-01-23 20:28:22 -05:00
|
|
|
(defconst org-x-dag-tag-prefix-order (list org-x-tag-misc-prefix
|
|
|
|
org-x-tag-resource-prefix
|
|
|
|
org-x-tag-location-prefix
|
|
|
|
org-x-tag-category-prefix)
|
|
|
|
"Order in which tags should appear in the agenda buffer (from right to left.")
|
|
|
|
|
|
|
|
(defun org-x-dag-collapse-tags (tags)
|
|
|
|
"Return TAGS with duplicates removed.
|
|
|
|
|
|
|
|
In the case of mutually exclusive tags, only the first tag
|
|
|
|
encountered will be returned."
|
|
|
|
(-let (((x non-x) (--separate (memq (elt it 0) org-x-exclusive-prefixes) tags)))
|
|
|
|
(->> (--group-by (elt it 0) x)
|
|
|
|
(--map (car (cdr it)) )
|
|
|
|
(append (-uniq non-x))
|
|
|
|
;; this removes the 'inherited' property on some of the tags, which
|
|
|
|
;; makes the agenda look cleaner (to me) since there are no
|
|
|
|
;; double-colons to separate inherited from non-inherited
|
|
|
|
;;
|
|
|
|
;; NOTE: this appears to have no effect on `org-agenda-tags' (eg the
|
|
|
|
;; inherited tags still show up in the menu properly)
|
|
|
|
(-map #'substring-no-properties))))
|
|
|
|
|
|
|
|
(defun org-x-dag-sort-tags (tags)
|
|
|
|
(cl-flet
|
|
|
|
((get-ranking
|
|
|
|
(tag)
|
|
|
|
(-if-let (i (-elem-index (elt tag 0) org-x-dag-tag-prefix-order))
|
|
|
|
(1+ i)
|
|
|
|
0)))
|
|
|
|
(->> (--map (cons it (get-ranking it)) tags)
|
|
|
|
(--sort (< (cdr it) (cdr other)))
|
|
|
|
(-map #'car))))
|
|
|
|
|
2022-01-25 23:23:17 -05:00
|
|
|
(defun org-x-dag-prepare-tags (tags)
|
|
|
|
(->> (org-x-dag-collapse-tags tags)
|
|
|
|
(org-x-dag-sort-tags)))
|
|
|
|
|
2022-01-15 00:41:11 -05:00
|
|
|
(defun org-x-dag-add-default-props (item)
|
|
|
|
(org-add-props item nil
|
2022-01-25 23:23:17 -05:00
|
|
|
'help-echo (org-x-dag-help-echo)
|
2022-01-15 00:41:11 -05:00
|
|
|
'org-not-done-regexp org-not-done-regexp
|
|
|
|
'org-todo-regexp org-todo-regexp
|
|
|
|
'org-complex-heading-regexp org-complex-heading-regexp
|
2022-01-23 20:05:08 -05:00
|
|
|
'mouse-face 'highlight))
|
2022-01-15 00:41:11 -05:00
|
|
|
|
2022-01-25 23:23:17 -05:00
|
|
|
(defun org-x-dag-id->formatted-level (id)
|
|
|
|
(-> (org-x-dag-id->metaprop id :level)
|
|
|
|
(org-reduced-level)
|
|
|
|
(make-string ?\s)))
|
|
|
|
|
|
|
|
(defun org-x-dag-help-echo ()
|
|
|
|
(->> (or (buffer-file-name (buffer-base-buffer))
|
|
|
|
(buffer-name (buffer-base-buffer)))
|
|
|
|
(abbreviate-file-name)
|
|
|
|
(format "mouse-2 or RET jump to Org file %S")))
|
|
|
|
|
|
|
|
(defun org-x-dag-headlines-get-regexp (re)
|
|
|
|
(let ((end (save-excursion (outline-next-heading))))
|
|
|
|
(-when-let (p (save-excursion (re-search-forward re end t)))
|
|
|
|
(list (1- (match-beginning 1)) (match-string 1)))))
|
|
|
|
|
2022-02-04 18:59:37 -05:00
|
|
|
(defun org-x-dag-timestamp-to-absolute (ts)
|
|
|
|
(->> (org-ml-get-properties '(:month-start :day-start :year-start) ts)
|
|
|
|
(calendar-absolute-from-gregorian)))
|
|
|
|
|
|
|
|
;; TODO 'modulus' only applies to the repeater
|
|
|
|
(defun org-ml-timestamp-extract-modulus (modtype ts)
|
|
|
|
"Return the modulus of timestamp TS for MODTYPE."
|
|
|
|
(cl-flet
|
|
|
|
((convert-value
|
|
|
|
(islongp value unit)
|
|
|
|
(pcase unit
|
2022-02-05 17:34:18 -05:00
|
|
|
('year (* 12 value))
|
|
|
|
('month value)
|
|
|
|
(_ (if islongp
|
|
|
|
;; TODO make these messages not suck
|
|
|
|
(pcase unit
|
|
|
|
('week (* 7 1440 value))
|
|
|
|
('day (* 1440 value))
|
|
|
|
('hour (* 60 value))
|
|
|
|
('minute value)
|
|
|
|
(_ (error)))
|
|
|
|
(pcase unit
|
|
|
|
('week (* 7 value))
|
|
|
|
('day value)
|
|
|
|
((or 'hour 'minute) (message "WARNING: ..."))
|
|
|
|
(_ (error)))))))
|
2022-02-04 18:59:37 -05:00
|
|
|
(convert-unit
|
|
|
|
(unit)
|
|
|
|
(if (memq unit '(year month)) 'month 'submonth)))
|
|
|
|
(-let* ((props (pcase modtype
|
|
|
|
('warning '(:warning-value :warning-unit :warning-type))
|
|
|
|
('repeater '(:repeater-value :repeater-unit :repeater-type))))
|
|
|
|
(islongp (->> (org-ml-timestamp-get-start-time ts)
|
|
|
|
(org-ml-time-is-long))))
|
|
|
|
(-when-let ((value unit type) (org-ml-get-properties props ts))
|
|
|
|
(let ((v (convert-value islongp value unit))
|
|
|
|
(u (convert-unit unit)))
|
|
|
|
`(,v ,u ,type))))))
|
|
|
|
|
|
|
|
(defun org-x-dag-partition-timestamp (ts)
|
|
|
|
(list :datetime (org-ml-timestamp-get-start-time ts)
|
|
|
|
:pos (org-ml-get-property :begin ts)
|
|
|
|
:repeater (org-ml-timestamp-extract-modulus 'repeater ts)
|
|
|
|
:warning (org-ml-timestamp-extract-modulus 'warning ts)))
|
|
|
|
|
|
|
|
(defmacro org-x-dag-with-times (datetime0 datetime1 form)
|
|
|
|
;; ASSUME all digits in this comparison are on the calendar/clock (eg day 32
|
|
|
|
;; does not 'rollover' to day 1 on the next month)
|
|
|
|
(declare (indent 2))
|
|
|
|
`(if (or (and (org-ml-time-is-long ,datetime0)
|
|
|
|
(org-ml-time-is-long ,datetime1))
|
|
|
|
(not (or (org-ml-time-is-long ,datetime0)
|
|
|
|
(org-ml-time-is-long ,datetime1))))
|
|
|
|
,form
|
|
|
|
(error "Datetimes are invalid lengths: %S and %S" ,datetime0 ,datetime1)))
|
|
|
|
|
|
|
|
;; TODO this function name sucks, call it datetime
|
|
|
|
(defun org-x-dag-date< (datetime0 datetime1)
|
|
|
|
(org-x-dag-with-times datetime0 datetime1
|
|
|
|
(-when-let (next (->> (-zip-with #'cons datetime0 datetime1)
|
|
|
|
(--drop-while (= (car it) (cdr it)))
|
|
|
|
(car)))
|
|
|
|
(< (car next) (cdr next)))))
|
|
|
|
|
|
|
|
(defun org-x-dag-date= (datetime0 datetime1)
|
|
|
|
(org-x-dag-with-times datetime0 datetime1
|
|
|
|
(->> (-zip-with #'cons datetime0 datetime1)
|
|
|
|
(--drop-while (= (car it) (cdr it)))
|
|
|
|
(not))))
|
|
|
|
|
|
|
|
(defun org-x-dag-time-shift (datetime shift unit)
|
|
|
|
(cl-flet*
|
|
|
|
((enc-dec-long
|
|
|
|
(y m d M H)
|
|
|
|
(-let (((_ M* H* d* m* y* _ _ _)
|
|
|
|
(->> (list 0 M H d m y nil nil (current-time-zone))
|
|
|
|
(encode-time)
|
|
|
|
(decode-time))))
|
|
|
|
(list y* m* d* H* M*)))
|
|
|
|
(enc-dec-short
|
|
|
|
(y m d)
|
|
|
|
(-take 3 (enc-dec-long y m d 0 0))))
|
|
|
|
(pcase datetime
|
|
|
|
((or `(,y ,m ,d) `(,y ,m ,d nil nil))
|
|
|
|
(pcase unit
|
|
|
|
('month (enc-dec-short y (+ m shift) d))
|
|
|
|
('submonth (enc-dec-short y m (+ d shift)))))
|
|
|
|
(`(,y ,m ,d ,H ,M)
|
|
|
|
(pcase unit
|
|
|
|
('month (enc-dec-long y (+ m shift) d H M))
|
|
|
|
('submonth (enc-dec-long y m d H (+ M shift))))))))
|
|
|
|
|
2022-02-05 17:34:18 -05:00
|
|
|
(defun org-x-dag-repeater-get-next (sel-datetime datetime shift shifttype reptype)
|
|
|
|
"Return the next timestamp repeater of DATETIME."
|
2022-02-04 18:59:37 -05:00
|
|
|
(pcase reptype
|
|
|
|
('catch-up
|
|
|
|
;; Next time is a multiple of repeater in the future relative to the base
|
|
|
|
;; time; shift one interval at a time since they may not be spaced evenly
|
|
|
|
;; (DST, leap year, different days in each month, etc). Think of this like
|
|
|
|
;; a path function from p-chem; shifting 3 months once might be different
|
|
|
|
;; than shifting by 1 month three times.
|
2022-02-05 17:34:18 -05:00
|
|
|
(let ((next datetime)
|
|
|
|
(pastp t))
|
|
|
|
(while pastp
|
|
|
|
(setq next (org-x-dag-time-shift next shift shifttype)
|
|
|
|
pastp (org-x-dag-date< next sel-datetime)))
|
2022-02-04 18:59:37 -05:00
|
|
|
next))
|
|
|
|
('restart
|
|
|
|
;; Next time is one repeater interval after now
|
|
|
|
;;
|
2022-02-05 17:34:18 -05:00
|
|
|
;; ASSUME cur needs to match the length of time
|
|
|
|
(org-x-dag-time-shift sel-datetime shift shifttype))
|
2022-02-04 18:59:37 -05:00
|
|
|
('cumulate
|
|
|
|
;; Next time is one repeater interval after the base timestamp
|
2022-02-05 17:34:18 -05:00
|
|
|
(org-x-dag-time-shift datetime shift shifttype))))
|
2022-02-04 18:59:37 -05:00
|
|
|
|
2022-02-05 17:34:18 -05:00
|
|
|
(defun org-x-dag-unfold-timestamp (cur datetime rep future-limit)
|
|
|
|
"Return all timestamps associated with DATETIME.
|
|
|
|
|
|
|
|
If REP is nil, return a singleton list just containing DATETIME.
|
|
|
|
If REP is non-nil, return DATETIME and all repeaters up until
|
|
|
|
FUTURE-LIMIT in a list."
|
2022-02-04 18:59:37 -05:00
|
|
|
;; ASSUME pts and future-limit are both long or short timestamps
|
2022-02-05 17:34:18 -05:00
|
|
|
(unless (org-x-dag-date< future-limit datetime)
|
|
|
|
(pcase rep
|
|
|
|
(`nil `(,datetime))
|
|
|
|
(`(,value ,unit ,reptype)
|
|
|
|
(->> (org-x-dag-repeater-get-next cur datetime value unit reptype)
|
|
|
|
(--unfold (unless (org-x-dag-date< future-limit it)
|
|
|
|
(cons it (org-x-dag-time-shift it value unit))))
|
|
|
|
(cons datetime))))))
|
2022-02-04 18:59:37 -05:00
|
|
|
|
|
|
|
(defun org-x-dag-date-add-time (date)
|
|
|
|
(-let (((_ M H) (decode-time (current-time))))
|
|
|
|
`(,@date ,H ,M)))
|
|
|
|
|
|
|
|
(defun org-x-dag-get-scheduled-at (sel-date pts)
|
|
|
|
(-let* (((&plist :datetime d :repeater r) pts)
|
|
|
|
(islongp (org-ml-time-is-long d))
|
|
|
|
(future-limit (if islongp `(,@sel-date 23 59) sel-date))
|
|
|
|
(sel-datetime (if islongp (org-x-dag-date-add-time sel-date) sel-date)))
|
|
|
|
(org-x-dag-unfold-timestamp sel-datetime d r future-limit)))
|
|
|
|
|
|
|
|
(defun org-x-dag-get-deadlines-at (sel-date pts)
|
|
|
|
(-let* (((&plist :datetime d :repeater r :warning w) pts)
|
|
|
|
(islongp (org-ml-time-is-long d))
|
|
|
|
((warn-shift warn-shifttype)
|
|
|
|
(if w w
|
|
|
|
(let ((f (if islongp 1440 1)))
|
|
|
|
`(,(* f org-deadline-warning-days) submonth))))
|
|
|
|
(sel-datetime (if islongp (org-x-dag-date-add-time sel-date) sel-date))
|
|
|
|
(future-limit (org-x-dag-time-shift sel-datetime warn-shift warn-shifttype)))
|
|
|
|
(org-x-dag-unfold-timestamp sel-datetime d r future-limit)))
|
|
|
|
|
|
|
|
(defun org-x-dag-headline-get-planning ()
|
|
|
|
(let ((end (save-excursion (outline-next-heading))))
|
|
|
|
(save-excursion
|
|
|
|
(when (re-search-forward org-planning-line-re end t)
|
|
|
|
(-let* ((pl (org-ml-parse-this-element)))
|
|
|
|
(->> (org-ml-get-properties '(:deadline :scheduled) pl)
|
|
|
|
(--map (-some-> it (org-x-dag-partition-timestamp)))))))))
|
|
|
|
|
2022-01-15 23:12:19 -05:00
|
|
|
(defun org-x-dag-format-tag-node (category tags key)
|
|
|
|
;; ASSUME I don't use subtree-level categories
|
|
|
|
(-let* (;; (category (org-get-category))
|
2022-01-25 23:23:17 -05:00
|
|
|
(tags* (org-x-dag-prepare-tags tags))
|
2022-01-15 00:41:11 -05:00
|
|
|
(head (org-get-heading))
|
2022-01-25 23:23:17 -05:00
|
|
|
(level (org-x-dag-id->formatted-level key))
|
2022-01-15 00:41:11 -05:00
|
|
|
(marker (org-agenda-new-marker))
|
|
|
|
;; no idea what this function actually does
|
2022-01-15 23:12:19 -05:00
|
|
|
((ts . ts-type) (org-agenda-entry-get-agenda-timestamp (point)))
|
2022-01-23 20:28:22 -05:00
|
|
|
(item (org-agenda-format-item "" head level category tags*))
|
2022-01-15 23:12:19 -05:00
|
|
|
(priority (org-get-priority item)))
|
|
|
|
(-> (org-x-dag-add-default-props item)
|
2022-01-15 00:41:11 -05:00
|
|
|
(org-add-props nil
|
|
|
|
;; face
|
|
|
|
'face 'default
|
|
|
|
'done-face 'org-agenda-done
|
|
|
|
'undone-face 'default
|
|
|
|
;; marker
|
|
|
|
'org-hd-marker marker
|
|
|
|
'org-marker marker
|
|
|
|
;; headline stuff
|
2022-01-23 20:05:08 -05:00
|
|
|
'todo-state (org-x-dag-id->todo key)
|
2022-01-15 00:41:11 -05:00
|
|
|
'priority priority
|
|
|
|
'ts-date ts
|
|
|
|
;; misc
|
2022-01-25 23:23:17 -05:00
|
|
|
'type (concat "tagsmatch" ts-type)))))
|
|
|
|
|
2022-02-04 18:59:37 -05:00
|
|
|
(defun org-x-dag-date-to-gregorian (date)
|
|
|
|
(-let (((y m d) date))
|
|
|
|
`(,m ,d ,y)))
|
|
|
|
|
|
|
|
(defun org-x-dag-time-get-clock-time (time)
|
|
|
|
(when (org-ml-time-is-long time) (list (nth 3 time) (nth 4 time))))
|
|
|
|
|
|
|
|
(defun org-x-dag-time-partition (time)
|
|
|
|
(if (org-ml-time-is-long time) (-split-at 3 time) `(,(-take 3 time) nil)))
|
|
|
|
|
|
|
|
(defun org-x-dag-date-diff (date0 date1)
|
|
|
|
""
|
|
|
|
(pcase (list date0 date1)
|
|
|
|
(`((,y0 ,m0 ,d0) (,y1 ,m1 ,d1))
|
|
|
|
(- (calendar-absolute-from-gregorian `(,m0 ,d0 ,y0))
|
|
|
|
(calendar-absolute-from-gregorian `(,m1 ,d1 ,y1))))
|
|
|
|
(_ (error "Invalid date format(s): %S or %S" date0 date1))))
|
|
|
|
|
|
|
|
(defun org-x-dag-format-item (id extra category tags time)
|
|
|
|
(let* ((tags* (org-x-dag-prepare-tags tags))
|
|
|
|
(head (org-get-heading))
|
|
|
|
(level (org-x-dag-id->formatted-level id))
|
|
|
|
(todo-state (org-x-dag-id->todo id))
|
|
|
|
(time-str (-some->> time (apply #'format "%02i:%02i ")))
|
|
|
|
(item (org-agenda-format-item extra head level category tags* time-str))
|
|
|
|
;; TODO why am I getting the priority after sending the headline
|
|
|
|
;; through some crazy formatting function?
|
|
|
|
(priority (org-get-priority item)))
|
2022-01-25 23:23:17 -05:00
|
|
|
(-> (org-x-dag-add-default-props item)
|
|
|
|
(org-add-props nil
|
2022-02-04 18:59:37 -05:00
|
|
|
'todo-state todo-state
|
|
|
|
'priority priority))))
|
|
|
|
|
|
|
|
(defun org-x-dag-planning-props (id face pos date ts-date type)
|
|
|
|
(list
|
|
|
|
;; face
|
|
|
|
'face (if (org-x-dag-id->is-done-p id) 'org-agenda-done face)
|
|
|
|
'undone-face face
|
|
|
|
'done-face 'org-agenda-done
|
|
|
|
;; marker
|
|
|
|
'org-hd-marker (org-agenda-new-marker)
|
|
|
|
'org-marker (org-agenda-new-marker pos)
|
|
|
|
;; headline stuff
|
|
|
|
'date (org-x-dag-date-to-gregorian date)
|
|
|
|
'ts-date (org-x-dag-date-to-gregorian ts-date)
|
|
|
|
'type type))
|
|
|
|
|
|
|
|
(defun org-x-dag-format-scheduled-node (sel-date pos datetime category tags id)
|
|
|
|
(-let* (((this-date this-time) (org-x-dag-time-partition datetime))
|
|
|
|
(diff (org-x-dag-date-diff this-date sel-date))
|
|
|
|
(pastp (< diff 0))
|
|
|
|
(todayp (= diff 0))
|
|
|
|
;; hopefully this is right...if it is this seems silly
|
|
|
|
(extra (-let (((today past) org-agenda-scheduled-leaders))
|
|
|
|
(cond (todayp today)
|
|
|
|
(pastp (format past (- diff)))
|
|
|
|
(t "")))) ;; This should never actually be used
|
|
|
|
(face (cond (pastp 'org-scheduled-previously)
|
|
|
|
(todayp 'org-scheduled-today)
|
|
|
|
(t 'org-scheduled)))
|
|
|
|
((date type) (if pastp `(,this-date "past-scheduled")
|
|
|
|
`(,sel-date "scheduled")))
|
|
|
|
(props (org-x-dag-planning-props id face pos date this-date type)))
|
|
|
|
;; NOTE: I don't care about habits, no need to consider them
|
|
|
|
(-> (org-x-dag-format-item id extra category tags this-time)
|
|
|
|
(org-add-props props))))
|
|
|
|
|
|
|
|
(defun org-x-dag-format-deadline-node (sel-date pos datetime category tags id)
|
|
|
|
(-let* (((this-date this-time) (org-x-dag-time-partition datetime))
|
|
|
|
(diff (org-x-dag-date-diff this-date sel-date))
|
|
|
|
(pastp (< diff 0))
|
|
|
|
(futurep (< 0 diff))
|
|
|
|
(extra (-let* (((now future past) org-agenda-deadline-leaders))
|
|
|
|
(cond
|
|
|
|
(futurep (format future diff))
|
|
|
|
(pastp (format past diff))
|
|
|
|
(t now))))
|
|
|
|
;; TODO the stock deadline formatter uses the warning time to
|
|
|
|
;; determine this based on percentage; I'm lazy and don't feel like
|
|
|
|
;; doing that (now) but I might in the future
|
|
|
|
(face (cond
|
|
|
|
((< 5 diff) 'org-upcoming-distant-deadline)
|
|
|
|
((< 1 diff) 'org-upcoming-deadline)
|
|
|
|
(t 'org-warning)))
|
|
|
|
((date type) (if futurep `(,sel-date "upcoming-deadline")
|
|
|
|
`(,this-date "deadline")))
|
|
|
|
(props (org-x-dag-planning-props id face pos date this-date type)))
|
|
|
|
(-> (org-x-dag-format-item id extra category tags this-time)
|
|
|
|
(org-add-props props))))
|
2022-01-15 00:41:11 -05:00
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
;;; HEADLINE PREDICATES
|
|
|
|
;;
|
|
|
|
;; The following are predicates that require the point to be above the
|
|
|
|
;; headline in question
|
2022-01-15 23:12:19 -05:00
|
|
|
|
2022-01-24 19:24:27 -05:00
|
|
|
(defun org-x-headline-has-timestamp (re want-time)
|
|
|
|
(let ((end (save-excursion (outline-next-heading))))
|
|
|
|
(-when-let (p (save-excursion (re-search-forward re end t)))
|
|
|
|
(if want-time (org-2ft (match-string 1)) p))))
|
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
(defun org-x-dag-headline-is-deadlined-p (want-time)
|
2022-01-15 23:12:19 -05:00
|
|
|
(org-x-headline-has-timestamp org-deadline-time-regexp want-time))
|
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
(defun org-x-dag-headline-is-scheduled-p (want-time)
|
2022-01-15 23:12:19 -05:00
|
|
|
(org-x-headline-has-timestamp org-scheduled-time-regexp want-time))
|
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
(defun org-x-dag-headline-is-closed-p (want-time)
|
2022-01-15 23:12:19 -05:00
|
|
|
(org-x-headline-has-timestamp org-closed-time-regexp want-time))
|
|
|
|
|
2022-01-24 19:24:27 -05:00
|
|
|
(defun org-x-dag-is-created-p (want-time)
|
|
|
|
(save-excursion
|
|
|
|
(-when-let (ts (org-x-dag-get-local-property org-x-prop-created))
|
|
|
|
(if want-time (org-2ft ts) t))))
|
2022-01-23 20:05:08 -05:00
|
|
|
|
2022-01-24 19:24:27 -05:00
|
|
|
(defun org-x-dag-headline-is-iterator-p ()
|
|
|
|
(save-excursion
|
|
|
|
(->> (org-x-dag-get-local-property org-x-prop-parent-type)
|
|
|
|
(equal org-x-prop-parent-type-iterator))))
|
2022-01-23 20:05:08 -05:00
|
|
|
|
2022-01-15 23:12:19 -05:00
|
|
|
(defconst org-x-headline-task-status-priorities
|
|
|
|
'((:archivable . -1)
|
|
|
|
(:complete . -1)
|
|
|
|
(:expired . 0)
|
|
|
|
(:done-unclosed . 0)
|
|
|
|
(:undone-closed . 0)
|
|
|
|
(:active . 1)
|
|
|
|
(:inert . 2)))
|
|
|
|
|
2022-01-18 18:34:20 -05:00
|
|
|
(defconst org-x-project-status-priorities
|
|
|
|
'((:archivable . -1)
|
|
|
|
(:complete . -1)
|
|
|
|
(:scheduled-project . 0)
|
|
|
|
(:invalid-todostate . 0)
|
|
|
|
(:undone-complete . 0)
|
|
|
|
(:done-incomplete . 0)
|
|
|
|
(:stuck . 0)
|
|
|
|
(:wait . 1)
|
|
|
|
(:held . 2)
|
|
|
|
(:active . 3)
|
|
|
|
(:inert . 4)))
|
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
(defun org-x-dag-time-is-archivable-p (epochtime)
|
|
|
|
(< (- (float-time) epochtime) (* 60 60 24 org-x-archive-delay)))
|
|
|
|
|
2022-01-23 23:05:20 -05:00
|
|
|
;;; STATUS DETERMINATION
|
|
|
|
|
|
|
|
(defmacro org-x-dag-with-key (key &rest body)
|
|
|
|
(declare (indent 1))
|
|
|
|
`(progn
|
|
|
|
(goto-char (org-x-dag-id->point ,key))
|
|
|
|
,@body))
|
|
|
|
|
2022-01-15 23:12:19 -05:00
|
|
|
(defun org-x-headline-get-task-status-0 (kw)
|
|
|
|
(if (member kw org-x-done-keywords)
|
2022-01-23 20:05:08 -05:00
|
|
|
(-if-let (c (org-x-dag-headline-is-closed-p t))
|
|
|
|
(if (org-x-dag-time-is-archivable-p c)
|
2022-01-15 23:12:19 -05:00
|
|
|
:archivable
|
|
|
|
:complete)
|
|
|
|
:done-unclosed)
|
|
|
|
(cond
|
|
|
|
((org-x-headline-is-expired-p) :expired)
|
|
|
|
((org-x-headline-is-inert-p) :inert)
|
2022-01-23 20:05:08 -05:00
|
|
|
((org-x-dag-headline-is-closed-p nil) :undone-closed)
|
2022-01-15 23:12:19 -05:00
|
|
|
(t :active))))
|
|
|
|
|
2022-01-22 18:05:07 -05:00
|
|
|
(defun org-x-dag-get-max-index (ys xs)
|
|
|
|
"Return the member of XS that has the highest index in YS."
|
|
|
|
(--max-by (> (-elem-index it ys) (-elem-index other ys)) xs))
|
2022-01-18 18:34:20 -05:00
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
(defmacro org-x-dag-descend-into-project (keys parent-tags codetree task-form
|
|
|
|
callback)
|
|
|
|
(declare (indent 2))
|
2022-01-18 18:34:20 -05:00
|
|
|
(let ((allowed-codes (-map #'car codetree))
|
|
|
|
(trans-tbl (--mapcat (-let (((a . bs) it))
|
|
|
|
(--map (cons it a) bs))
|
|
|
|
codetree)))
|
|
|
|
`(cl-flet
|
|
|
|
((get-project-or-task-status
|
|
|
|
(key)
|
2022-01-23 20:05:08 -05:00
|
|
|
(-if-let (children (org-x-dag-id->headline-children key))
|
2022-01-23 20:28:22 -05:00
|
|
|
(let* ((tags (org-x-dag-id->tags nil ,parent-tags key))
|
2022-01-23 20:05:08 -05:00
|
|
|
(child-results (funcall ,callback key tags children))
|
2022-01-18 18:34:20 -05:00
|
|
|
;; ASSUME the car of the results will be the toplevel
|
|
|
|
;; key/status pair for this (sub)project
|
|
|
|
(top-status (plist-get (car child-results) :status))
|
|
|
|
(top-status* (if (member top-status ',allowed-codes)
|
|
|
|
top-status
|
|
|
|
(alist-get top-status ',trans-tbl))))
|
|
|
|
(cons top-status* child-results))
|
2022-01-23 20:05:08 -05:00
|
|
|
(let ((it-kw (org-x-dag-id->todo key)))
|
2022-01-22 18:05:07 -05:00
|
|
|
(org-x-dag-with-key key
|
|
|
|
(-> ,task-form
|
|
|
|
(nth ',allowed-codes)
|
|
|
|
(list)))))))
|
2022-01-18 18:34:20 -05:00
|
|
|
(let* ((results (-map #'get-project-or-task-status ,keys))
|
|
|
|
(status (->> (-map #'car results)
|
2022-01-22 18:05:07 -05:00
|
|
|
(org-x-dag-get-max-index ',allowed-codes))))
|
2022-01-18 18:34:20 -05:00
|
|
|
(cons status (-mapcat #'cdr results))))))
|
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
(defun org-x-dag-headline-get-project-status (key tags children)
|
2022-01-18 18:34:20 -05:00
|
|
|
;; ASSUME children will always be at least 1 long
|
2022-01-22 18:05:07 -05:00
|
|
|
(org-x-dag-with-key key
|
2022-01-23 20:05:08 -05:00
|
|
|
(let ((keyword (org-x-dag-id->todo key)))
|
|
|
|
(-let (((status . child-results)
|
|
|
|
(cond
|
|
|
|
((org-x-dag-headline-is-scheduled-p nil)
|
|
|
|
(list :scheduled-project))
|
|
|
|
((equal keyword org-x-kw-hold)
|
|
|
|
(list (if (org-x-headline-is-inert-p) :inert :held)))
|
|
|
|
((member keyword org-x--project-invalid-todostates)
|
|
|
|
(list :invalid-todostate))
|
|
|
|
((equal keyword org-x-kw-canc)
|
|
|
|
(list (if (org-x-headline-is-archivable-p) :archivable :complete)))
|
|
|
|
((equal keyword org-x-kw-done)
|
|
|
|
(org-x-dag-descend-into-project children tags
|
|
|
|
((:archivable)
|
|
|
|
(:complete)
|
|
|
|
(:done-incomplete :stuck :inert :held :wait :active
|
|
|
|
:scheduled-project :invalid-todostate
|
|
|
|
:undone-complete))
|
|
|
|
(if (member it-kw org-x-done-keywords)
|
|
|
|
(if (org-x-headline-is-archivable-p) 0 1)
|
|
|
|
2)
|
|
|
|
#'org-x-dag-headline-get-project-status))
|
|
|
|
((equal keyword org-x-kw-todo)
|
|
|
|
(org-x-dag-descend-into-project children tags
|
|
|
|
((:undone-complete :complete :archivable)
|
|
|
|
(:stuck :scheduled-project :invalid-todostate
|
|
|
|
:done-incomplete)
|
|
|
|
(:held)
|
|
|
|
(:wait)
|
|
|
|
(:inert)
|
|
|
|
(:active))
|
|
|
|
(cond
|
|
|
|
((and (not (member it-kw org-x-done-keywords))
|
|
|
|
(org-x-headline-is-inert-p))
|
|
|
|
4)
|
|
|
|
((equal it-kw org-x-kw-todo)
|
|
|
|
(if (org-x-dag-headline-is-scheduled-p nil) 5 1))
|
|
|
|
((equal it-kw org-x-kw-hold)
|
|
|
|
2)
|
|
|
|
((equal it-kw org-x-kw-wait)
|
|
|
|
3)
|
|
|
|
((equal it-kw org-x-kw-next)
|
|
|
|
5)
|
|
|
|
(t 0))
|
|
|
|
#'org-x-dag-headline-get-project-status))
|
|
|
|
(t (error "Invalid keyword detected: %s" keyword)))))
|
|
|
|
(cons (list :key key :status status :tags tags) child-results)))))
|
|
|
|
|
|
|
|
(defun org-x-dag-headline-get-iterator-project-status (key children)
|
|
|
|
(org-x-dag-with-key key
|
|
|
|
(let* ((kw (org-x-dag-id->todo key))
|
2022-01-22 18:05:07 -05:00
|
|
|
(status
|
|
|
|
(cond
|
|
|
|
((or (member kw org-x--project-invalid-todostates)
|
2022-01-23 20:05:08 -05:00
|
|
|
(org-x-dag-headline-is-scheduled-p nil))
|
2022-01-22 18:05:07 -05:00
|
|
|
(list :project-error))
|
|
|
|
((equal kw org-x-kw-canc)
|
|
|
|
(list :empt))
|
|
|
|
;; TODO this is a bit awkward since I don't care about the child statuses
|
|
|
|
;; and I don't care about tags
|
|
|
|
((equal kw org-x-kw-done)
|
2022-01-23 20:05:08 -05:00
|
|
|
(org-x-dag-descend-into-project children nil
|
2022-01-22 18:05:07 -05:00
|
|
|
((:empt)
|
|
|
|
(:project-error :unscheduled :actv))
|
|
|
|
(if (member it-kw org-x-done-keywords) 0 1)
|
2022-02-04 18:59:37 -05:00
|
|
|
;; TODO this has an argument mismatch
|
2022-01-22 18:05:07 -05:00
|
|
|
#'org-x-dag-headline-get-iterator-project-status))
|
|
|
|
((equal kw org-x-kw-todo)
|
2022-01-23 20:05:08 -05:00
|
|
|
(org-x-dag-descend-into-project children nil
|
2022-01-22 18:05:07 -05:00
|
|
|
((:unscheduled :project-error)
|
|
|
|
(:empt)
|
|
|
|
(:actv))
|
2022-02-04 18:59:37 -05:00
|
|
|
;; TODO this triggers a compiler warning because I don't use
|
|
|
|
;; `it-kw'
|
2022-01-23 20:05:08 -05:00
|
|
|
(let ((ts (org-x-dag-headline-is-scheduled-p t)))
|
2022-01-22 18:05:07 -05:00
|
|
|
(cond
|
|
|
|
((not ts) 0)
|
|
|
|
((> org-x-iterator-active-future-offset (- ts (float-time))) 1)
|
|
|
|
(t 2)))
|
|
|
|
#'org-x-dag-headline-get-iterator-project-status))
|
|
|
|
(t (error "Invalid keyword detected: %s" kw)))))
|
|
|
|
status)))
|
|
|
|
|
|
|
|
(defun org-x-dag-headline-get-iterator-task-status (key)
|
|
|
|
(org-x-dag-with-key key
|
2022-01-23 20:05:08 -05:00
|
|
|
(if (org-x-dag-id->is-done-p key) :empt
|
|
|
|
(-if-let (ts (or (org-x-dag-headline-is-scheduled-p t)
|
|
|
|
(org-x-dag-headline-is-deadlined-p t)))
|
|
|
|
(if (< org-x-iterator-active-future-offset (- ts (float-time)))
|
|
|
|
:actv
|
|
|
|
:empt)
|
|
|
|
:unscheduled))))
|
|
|
|
|
|
|
|
(defun org-x-dag-headline-get-iterator-status (key)
|
2022-01-22 18:05:07 -05:00
|
|
|
(cl-flet
|
|
|
|
((get-status
|
|
|
|
(key)
|
2022-01-23 20:05:08 -05:00
|
|
|
(-if-let (children (org-x-dag-id->headline-children key))
|
2022-01-22 18:05:07 -05:00
|
|
|
(->> children
|
2022-01-23 20:05:08 -05:00
|
|
|
(org-x-dag-headline-get-iterator-project-status key)
|
2022-01-22 18:05:07 -05:00
|
|
|
(car))
|
|
|
|
(org-x-dag-headline-get-iterator-task-status key))))
|
2022-01-23 20:05:08 -05:00
|
|
|
(->> (org-x-dag-id->headline-children key)
|
2022-01-22 18:05:07 -05:00
|
|
|
(-map #'get-status)
|
|
|
|
(org-x-dag-get-max-index org-x--iter-statuscodes))))
|
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
;;; SCANNERS
|
|
|
|
;;
|
|
|
|
;; Not sure what to call these, they convert the DAG to a list of agenda strings
|
2022-01-18 18:34:20 -05:00
|
|
|
|
2022-01-22 23:06:53 -05:00
|
|
|
(defmacro org-x-dag-with-files (files pre-form form)
|
|
|
|
(declare (indent 2))
|
|
|
|
(let* ((lookup-form '(ht-get file->ids it-file))
|
|
|
|
(pre-form* (if pre-form
|
|
|
|
`(--filter ,pre-form ,lookup-form)
|
|
|
|
lookup-form)))
|
|
|
|
`(-let (((&plist :file->ids) org-x-dag))
|
|
|
|
(cl-flet
|
|
|
|
((proc-file
|
|
|
|
(it-file)
|
|
|
|
(-when-let (keys ,pre-form*)
|
|
|
|
(org-x-with-file it-file
|
2022-01-23 20:28:22 -05:00
|
|
|
;; NOTE there are other ways in org to get the category; the
|
|
|
|
;; only one I ever cared about was the filename. Very simple,
|
|
|
|
;; category = filename. Done
|
|
|
|
(let ((it-category (f-base it-file)))
|
|
|
|
(--mapcat ,form keys))))))
|
2022-01-22 23:06:53 -05:00
|
|
|
(-non-nil (-mapcat #'proc-file ,files))))))
|
|
|
|
|
2022-01-18 18:34:20 -05:00
|
|
|
(defun org-x-dag-scan-projects ()
|
|
|
|
(cl-flet*
|
|
|
|
((format-result
|
|
|
|
(cat result)
|
|
|
|
(-let* (((&plist :key :status :tags) result)
|
|
|
|
(priority (alist-get status org-x-project-status-priorities)))
|
|
|
|
(when (>= priority 0)
|
|
|
|
(org-x-dag-with-key key
|
|
|
|
(-> (org-x-dag-format-tag-node cat tags key)
|
|
|
|
(org-add-props nil
|
2022-01-23 20:05:08 -05:00
|
|
|
'x-toplevelp (org-x-dag-id->is-toplevel-p key)
|
2022-01-18 18:34:20 -05:00
|
|
|
'x-status status
|
2022-01-23 20:05:08 -05:00
|
|
|
'x-priority priority))))))
|
|
|
|
(format-key
|
2022-01-23 20:28:22 -05:00
|
|
|
(cat key)
|
|
|
|
(let ((tags (org-x-dag-id->tags t org-file-tags key)))
|
2022-01-23 20:05:08 -05:00
|
|
|
;; TODO don't hardcode these things
|
|
|
|
(org-x-dag-with-key key
|
2022-01-18 18:34:20 -05:00
|
|
|
(unless (or (member org-x-tag-incubated tags)
|
2022-01-23 20:05:08 -05:00
|
|
|
(org-x-dag-headline-is-iterator-p))
|
|
|
|
(-some->> (org-x-dag-id->headline-children key)
|
|
|
|
(org-x-dag-headline-get-project-status key tags)
|
|
|
|
(--map (format-result cat it))))))))
|
|
|
|
(org-x-dag-with-files (org-x-get-action-files)
|
|
|
|
(and (org-x-dag-id->is-toplevel-p it)
|
|
|
|
(not (org-x-dag-id->is-done-p it)))
|
2022-01-23 20:28:22 -05:00
|
|
|
(format-key it-category it))))
|
2022-01-18 18:34:20 -05:00
|
|
|
|
2022-01-22 18:05:07 -05:00
|
|
|
(defun org-x-dag-scan-iterators ()
|
|
|
|
(cl-flet*
|
|
|
|
((format-result
|
|
|
|
(tags cat key)
|
2022-01-23 20:05:08 -05:00
|
|
|
(-let ((status (org-x-dag-headline-get-iterator-status key)))
|
2022-01-22 18:05:07 -05:00
|
|
|
(org-x-dag-with-key key
|
|
|
|
(-> (org-x-dag-format-tag-node cat tags key)
|
|
|
|
(org-add-props nil
|
|
|
|
'x-status status))))))
|
2022-01-23 20:05:08 -05:00
|
|
|
(org-x-dag-with-files (org-x-get-action-files)
|
|
|
|
(org-x-dag-id->is-toplevel-p it)
|
|
|
|
(let ((tags (org-x-dag-id->tags t org-file-tags it)))
|
|
|
|
(unless (member org-x-tag-incubated tags)
|
2022-01-23 20:28:22 -05:00
|
|
|
(org-x-dag-with-key it
|
|
|
|
(when (org-x-dag-headline-is-iterator-p)
|
|
|
|
(list (format-result tags it-category it)))))))))
|
2022-01-23 20:05:08 -05:00
|
|
|
|
2022-01-22 23:06:53 -05:00
|
|
|
(defun org-x-dag-get-task-nodes (id)
|
|
|
|
(declare (indent 2))
|
|
|
|
(cl-labels
|
|
|
|
((descend
|
|
|
|
(children)
|
|
|
|
;; TODO don't hardcode this
|
2022-01-23 20:05:08 -05:00
|
|
|
(->> (--remove (member (org-x-dag-id->todo it)
|
2022-01-22 23:06:53 -05:00
|
|
|
(list org-x-kw-canc org-x-kw-hold))
|
|
|
|
children)
|
|
|
|
(--mapcat (-if-let (cs (org-x-dag-id->headline-children it))
|
|
|
|
(descend cs)
|
|
|
|
(list it))))))
|
|
|
|
(-some-> (org-x-dag-id->headline-children id)
|
|
|
|
(descend))))
|
|
|
|
|
2022-01-15 00:41:11 -05:00
|
|
|
(defun org-x-dag-scan-tasks ()
|
2022-01-22 23:06:53 -05:00
|
|
|
(cl-flet
|
|
|
|
((format-key
|
|
|
|
(category is-standalone key)
|
2022-01-23 20:05:08 -05:00
|
|
|
(let ((tags (org-x-dag-id->tags t org-file-tags key)))
|
2022-01-22 18:05:07 -05:00
|
|
|
;; filter out incubators
|
|
|
|
(org-x-dag-with-key key
|
|
|
|
(unless (or (member org-x-tag-incubated tags)
|
2022-01-23 20:05:08 -05:00
|
|
|
(org-x-dag-headline-is-scheduled-p nil)
|
|
|
|
(org-x-dag-headline-is-deadlined-p nil))
|
|
|
|
(let* ((s (org-x-headline-get-task-status-0 (org-x-dag-id->todo key)))
|
2022-01-22 18:05:07 -05:00
|
|
|
(p (alist-get s org-x-headline-task-status-priorities)))
|
|
|
|
(unless (= p -1)
|
2022-01-22 23:06:53 -05:00
|
|
|
(-> (org-x-dag-format-tag-node category tags key)
|
|
|
|
(org-add-props nil
|
|
|
|
'x-is-standalone is-standalone
|
|
|
|
'x-status s)))))))))
|
|
|
|
(org-x-dag-with-files (org-x-get-action-files)
|
|
|
|
(org-x-dag-id->is-toplevel-p it)
|
2022-01-23 20:28:22 -05:00
|
|
|
(-if-let (project-tasks (org-x-dag-get-task-nodes it))
|
|
|
|
(--map (format-key it-category nil it) project-tasks)
|
|
|
|
(list (format-key it-category t it))))))
|
2022-01-15 00:41:11 -05:00
|
|
|
|
2022-01-23 12:01:41 -05:00
|
|
|
(defun org-x-dag-scan-incubated ()
|
|
|
|
(cl-flet
|
|
|
|
((format-key
|
|
|
|
(category key)
|
2022-01-23 20:05:08 -05:00
|
|
|
(let ((tags (org-x-dag-id->tags t org-file-tags key)))
|
2022-01-23 12:01:41 -05:00
|
|
|
(when (member org-x-tag-incubated tags)
|
|
|
|
(org-x-dag-with-key key
|
2022-01-23 20:05:08 -05:00
|
|
|
(let* ((sch (org-x-dag-headline-is-scheduled-p t))
|
|
|
|
(dead (org-x-dag-headline-is-deadlined-p t))
|
2022-01-23 12:01:41 -05:00
|
|
|
(is-project (org-x-dag-id->headline-children key)))
|
|
|
|
(-> (org-x-dag-format-tag-node category tags key)
|
|
|
|
(org-add-props nil
|
|
|
|
'x-project-p is-project
|
|
|
|
'x-scheduled sch
|
|
|
|
'x-deadlined dead))))))))
|
|
|
|
(org-x-dag-with-files (org-x-get-action-and-incubator-files)
|
|
|
|
(and (org-x-dag-id->is-toplevel-p it)
|
2022-01-23 20:05:08 -05:00
|
|
|
(not (org-x-dag-id->is-done-p it)))
|
2022-01-23 20:28:22 -05:00
|
|
|
(list (format-key it-category it)))))
|
2022-01-15 00:41:11 -05:00
|
|
|
|
2022-01-23 12:41:56 -05:00
|
|
|
(defun org-x-dag-scan-archived ()
|
|
|
|
(cl-flet
|
|
|
|
((format-key
|
|
|
|
(category key)
|
2022-01-23 20:05:08 -05:00
|
|
|
(let ((tags (org-x-dag-id->tags t org-file-tags key)))
|
2022-01-23 12:41:56 -05:00
|
|
|
(unless (member org-x-tag-incubated tags)
|
|
|
|
(org-x-dag-with-key key
|
|
|
|
(-let (((is-archivable is-project)
|
|
|
|
(-if-let (children (org-x-dag-id->headline-children key))
|
2022-02-04 18:59:37 -05:00
|
|
|
(-> (org-x-dag-headline-get-project-status key tags children)
|
2022-01-23 12:41:56 -05:00
|
|
|
(alist-get org-x-project-status-priorities)
|
|
|
|
(eq :archivable)
|
|
|
|
(list t))
|
2022-01-23 20:05:08 -05:00
|
|
|
(-> (org-x-headline-get-task-status-0 (org-x-dag-id->todo key))
|
2022-01-23 12:41:56 -05:00
|
|
|
(alist-get org-x-headline-task-status-priorities)
|
|
|
|
(eq :archivable)
|
|
|
|
(list t)))))
|
|
|
|
(when is-archivable
|
|
|
|
(-> (org-x-dag-format-tag-node category tags key)
|
|
|
|
(org-add-props nil
|
|
|
|
'x-project-p is-project)))))))))
|
|
|
|
(org-x-dag-with-files (org-x-get-action-files)
|
|
|
|
(org-x-dag-id->is-toplevel-p it)
|
2022-01-23 23:05:20 -05:00
|
|
|
(org-x-dag-with-key it
|
|
|
|
(if (org-x-dag-headline-is-iterator-p)
|
2022-02-04 18:59:37 -05:00
|
|
|
(->> (org-x-dag-id->headline-children it)
|
|
|
|
(--map (format-key it-category it)))
|
2022-01-23 23:05:20 -05:00
|
|
|
(list (format-key it-category it)))))))
|
|
|
|
|
|
|
|
(defun org-x-dag-scan-ltgs ()
|
|
|
|
(let ((child-files (append (list (org-x-get-lifetime-goal-file)
|
|
|
|
(org-x-get-endpoint-goal-file))
|
|
|
|
(org-x-get-action-files))))
|
|
|
|
(cl-flet
|
|
|
|
((format-id
|
|
|
|
(category id)
|
|
|
|
(let ((toplevelp (org-x-dag-id->is-toplevel-p id))
|
|
|
|
(has-children (->> (org-x-dag-id->children id)
|
|
|
|
(--any-p (member (org-x-dag-id->file it)
|
|
|
|
child-files))))
|
|
|
|
(tags (org-x-dag-id->tags t nil id)))
|
|
|
|
(-> (org-x-dag-format-tag-node category tags id)
|
|
|
|
(org-add-props nil
|
|
|
|
'x-goal-status (list :type 'ltg
|
|
|
|
:childlessp (not has-children)
|
|
|
|
:toplevelp toplevelp
|
|
|
|
:parentlessp nil))))))
|
|
|
|
(org-x-dag-with-files (list (org-x-get-lifetime-goal-file))
|
|
|
|
nil
|
2022-01-23 20:05:08 -05:00
|
|
|
(org-x-dag-with-key it
|
2022-01-23 23:05:20 -05:00
|
|
|
(list (format-id it-category it)))))))
|
|
|
|
|
|
|
|
(defun org-x-dag-scan-epgs ()
|
|
|
|
(let ((child-files (cons (org-x-get-endpoint-goal-file)
|
|
|
|
(org-x-get-action-files)))
|
|
|
|
(parent-files (list (org-x-get-endpoint-goal-file)
|
|
|
|
(org-x-get-lifetime-goal-file))))
|
|
|
|
(cl-flet
|
|
|
|
((format-id
|
|
|
|
(category id)
|
|
|
|
(let ((toplevelp (org-x-dag-id->is-toplevel-p id))
|
|
|
|
(has-children (->> (org-x-dag-id->children id)
|
|
|
|
(--any-p (member (org-x-dag-id->file it)
|
|
|
|
child-files))))
|
|
|
|
(has-parents (->> (org-x-dag-id->parents id)
|
|
|
|
(--any-p (member (org-x-dag-id->file it)
|
|
|
|
parent-files))))
|
|
|
|
(tags (org-x-dag-id->tags t nil id)))
|
|
|
|
(-> (org-x-dag-format-tag-node category tags id)
|
|
|
|
(org-add-props nil
|
|
|
|
'x-goal-status (list :type 'epg
|
|
|
|
:childlessp (not has-children)
|
|
|
|
:toplevelp toplevelp
|
|
|
|
:parentlessp (not has-parents)))))))
|
|
|
|
(org-x-dag-with-files (list (org-x-get-endpoint-goal-file))
|
|
|
|
nil
|
|
|
|
(org-x-dag-with-key it
|
|
|
|
(list (format-id it-category it)))))))
|
|
|
|
|
|
|
|
(defun org-x-dag-scan-goals ()
|
|
|
|
(append (org-x-dag-scan-ltgs) (org-x-dag-scan-epgs)))
|
2022-01-15 00:41:11 -05:00
|
|
|
|
2022-01-24 19:24:27 -05:00
|
|
|
(defun org-x-dag-scan-errors ()
|
|
|
|
(cl-flet
|
|
|
|
((format-id
|
|
|
|
(category id)
|
|
|
|
(org-x-dag-with-key id
|
|
|
|
(-when-let (error-type
|
|
|
|
(if (org-x-dag-headline-is-iterator-p)
|
|
|
|
(unless (org-x-dag-get-local-property "ARCHIVE")
|
|
|
|
:missing-archive)
|
|
|
|
(-if-let (created (org-x-dag-is-created-p t))
|
|
|
|
(when (<= (float-time) created)
|
|
|
|
:future-created)
|
|
|
|
:missing-created)))
|
|
|
|
(-> (org-x-dag-format-tag-node category nil id)
|
|
|
|
(org-add-props nil
|
|
|
|
'x-error error-type))))))
|
|
|
|
(org-x-dag-with-files (org-x-dag-get-files)
|
|
|
|
(not (org-x-dag-id->is-done-p it))
|
|
|
|
(org-x-dag-with-key it
|
|
|
|
(list (format-id it-category it))))))
|
|
|
|
|
2022-02-04 18:59:37 -05:00
|
|
|
(defun org-x-dag-scan-agenda (sel-date)
|
|
|
|
(cl-flet*
|
|
|
|
((format-timestamps
|
|
|
|
(sel-date cat id pts get-datetimes-fun format-datetime-fun)
|
|
|
|
(-when-let (datetimes (funcall get-datetimes-fun sel-date pts))
|
2022-02-05 17:34:18 -05:00
|
|
|
(let ((tags (org-x-dag-id->tags t org-file-tags id)))
|
|
|
|
(unless (member org-x-tag-incubated tags)
|
|
|
|
(-let (((&plist :pos) pts)
|
|
|
|
(donep (org-x-dag-id->is-done-p id)))
|
|
|
|
(->> datetimes
|
|
|
|
(--remove (and donep (not (org-x-dag-date= (-take 3 it) sel-date))))
|
|
|
|
(--map (funcall format-datetime-fun sel-date pos it cat tags id))))))))
|
2022-02-04 18:59:37 -05:00
|
|
|
(format-id
|
|
|
|
(cat id)
|
|
|
|
(org-x-dag-with-key id
|
|
|
|
(-when-let (res (org-x-dag-headline-get-planning))
|
|
|
|
(-let (((dead sched) res))
|
2022-02-05 17:34:18 -05:00
|
|
|
(append
|
|
|
|
(when dead
|
|
|
|
(format-timestamps sel-date cat id dead
|
|
|
|
#'org-x-dag-get-deadlines-at
|
|
|
|
#'org-x-dag-format-deadline-node))
|
|
|
|
(when sched
|
|
|
|
(format-timestamps sel-date cat id sched
|
|
|
|
#'org-x-dag-get-scheduled-at
|
|
|
|
#'org-x-dag-format-scheduled-node))))))))
|
2022-02-04 18:59:37 -05:00
|
|
|
(org-x-dag-with-files (org-x-get-action-files)
|
|
|
|
nil
|
2022-02-05 17:34:18 -05:00
|
|
|
(format-id it-category it))))
|
2022-02-04 18:59:37 -05:00
|
|
|
|
2022-01-15 00:41:11 -05:00
|
|
|
;;; AGENDA VIEWS
|
|
|
|
|
2022-01-23 20:05:08 -05:00
|
|
|
;; (defun org-x-dag-show-tasks (_match)
|
2022-01-18 18:34:20 -05:00
|
|
|
;; (org-x-dag-sync t)
|
2022-01-23 20:05:08 -05:00
|
|
|
;; ;; hack to make the loop only run once
|
|
|
|
;; (let ((org-agenda-files (list (car (org-x-get-action-files)))))
|
2022-01-18 18:34:20 -05:00
|
|
|
;; (nd/with-advice
|
2022-01-23 20:05:08 -05:00
|
|
|
;; (('org-scan-tags :override (lambda (&rest _) (org-x-dag-scan-tasks))))
|
2022-01-18 18:34:20 -05:00
|
|
|
;; (org-tags-view '(4) "TODO"))))
|
2022-01-15 00:41:11 -05:00
|
|
|
|
|
|
|
(defun org-x-dag-show-nodes (get-nodes)
|
2022-01-15 23:12:19 -05:00
|
|
|
(org-x-dag-sync)
|
2022-01-15 00:41:11 -05:00
|
|
|
(let* ((org-tags-match-list-sublevels org-tags-match-list-sublevels)
|
2022-02-04 18:59:37 -05:00
|
|
|
(completion-ignore-case t))
|
2022-01-15 00:41:11 -05:00
|
|
|
(catch 'exit
|
|
|
|
(org-agenda-prepare (concat "DAG-TAG"))
|
|
|
|
(org-compile-prefix-format 'tags)
|
|
|
|
(org-set-sorting-strategy 'tags)
|
|
|
|
(let ((org-agenda-redo-command `(org-x-dag-show-nodes ',get-nodes))
|
|
|
|
(rtnall (funcall get-nodes)))
|
|
|
|
(org-agenda--insert-overriding-header
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert "Headlines with TAGS match: \n")
|
|
|
|
(add-text-properties (point-min) (1- (point))
|
|
|
|
(list 'face 'org-agenda-structure))
|
|
|
|
(buffer-string)))
|
|
|
|
(org-agenda-mark-header-line (point-min))
|
|
|
|
(when rtnall
|
|
|
|
(insert (org-agenda-finalize-entries rtnall 'tags) "\n"))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(or org-agenda-multi (org-agenda-fit-window-to-buffer))
|
|
|
|
(add-text-properties
|
|
|
|
(point-min) (point-max)
|
|
|
|
`(org-agenda-type tags
|
|
|
|
org-last-args (,get-nodes)
|
|
|
|
org-redo-cmd ,org-agenda-redo-command
|
|
|
|
org-series-cmd ,org-cmd))
|
|
|
|
(org-agenda-finalize)
|
|
|
|
(setq buffer-read-only t)))))
|
|
|
|
|
2022-02-05 17:34:18 -05:00
|
|
|
;; make the signature exactly like `org-agenda-list' ...for now
|
|
|
|
(defun org-x-dag-show-daily-nodes (&optional arg start-day span with-hour)
|
|
|
|
(org-x-dag-sync)
|
|
|
|
;; TODO not sure if this is actually necessary
|
|
|
|
(when org-agenda-overriding-arguments
|
|
|
|
(-setq (arg start-day span) org-agenda-overriding-arguments))
|
|
|
|
(let* ((org-tags-match-list-sublevels org-tags-match-list-sublevels)
|
|
|
|
(completion-ignore-case t))
|
|
|
|
(catch 'exit
|
|
|
|
(org-agenda-prepare "DAG-DAILY")
|
|
|
|
(org-compile-prefix-format 'agenda)
|
|
|
|
(org-set-sorting-strategy 'agenda)
|
|
|
|
(-let* ((today (org-today))
|
|
|
|
(sd (or start-day today))
|
|
|
|
(org-agenda-redo-command `(org-x-dag-show-daily-nodes
|
|
|
|
',arg ,start-day ',span ,with-hour))
|
|
|
|
((m d y) (calendar-gregorian-from-absolute sd))
|
|
|
|
(rtnall (org-x-dag-scan-agenda `(,y ,m ,d))))
|
|
|
|
(setq-local org-starting-day sd)
|
|
|
|
(setq-local org-arg-loc arg)
|
|
|
|
;; TODO just day (for now)
|
|
|
|
(setq-local org-agenda-current-span 'day)
|
|
|
|
(org-agenda--insert-overriding-header
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert (format "Agenda for %d-%02d-%02d: \n" y m d))
|
|
|
|
(add-text-properties (point-min) (1- (point))
|
|
|
|
(list 'face 'org-agenda-structure))
|
|
|
|
(buffer-string)))
|
|
|
|
(org-agenda-mark-header-line (point-min))
|
|
|
|
;; TODO handle time grid here somehow
|
|
|
|
(-some--> (org-agenda-add-time-grid-maybe rtnall 1 (= sd today))
|
|
|
|
(org-agenda-finalize-entries it 'agenda)
|
|
|
|
(insert it "\n"))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(or org-agenda-multi (org-agenda-fit-window-to-buffer))
|
|
|
|
(add-text-properties
|
|
|
|
(point-min) (point-max)
|
|
|
|
`(org-agenda-type agenda
|
|
|
|
org-last-args (,arg ,start-day ,span)
|
|
|
|
org-redo-cmd ,org-agenda-redo-command
|
|
|
|
org-series-cmd ,org-cmd))
|
|
|
|
(org-agenda-finalize)
|
|
|
|
(setq buffer-read-only t)))))
|
|
|
|
|
2022-01-15 00:41:11 -05:00
|
|
|
(provide 'org-x-dag)
|
|
|
|
;;; org-x-dag.el ends here
|