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

ENH make comprehensive action status function

This commit is contained in:
Nathan Dwarshuis 2022-03-12 21:15:43 -05:00
parent bd9e60b676
commit f9ecc76494
1 changed files with 363 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1382,6 +1382,8 @@ headline."
(org-x-dag-get-buffer-nodes file (org-x-dag-get-buffer-nodes file
org-todo-keywords-1 org-todo-keywords-1
(list org-x-prop-parent-type (list org-x-prop-parent-type
org-x-prop-time-shift
"ARCHIVE"
org-x-prop-created)))) org-x-prop-created))))
;;; DAG SYNCHRONIZATION/CONSTRUCTION ;;; DAG SYNCHRONIZATION/CONSTRUCTION
@ -1620,246 +1622,379 @@ removed from, added to, or edited within the DAG respectively."
;; - closed keywords must be marked DONE/CANC ;; - closed keywords must be marked DONE/CANC
(t (check-done id kw)))))))) (t (check-done id kw))))))))
(defun org-x-dag-id-status (id type data) ;; type Status = Either String (Enum, a)
(let ((payload (cl-case type ;; data NodeData a = Status { props :: [something], status = Status a }
((:error :status) `(,type ,data))
(t (error "invalid status type: %s" type)))))
`(,id . ,payload)))
(defun org-x-dag-id-action-status (id status-type action-type code) (defun org-x-dag-status-valid (id data)
(org-x-dag-id-status id status-type (list :type action-type :code code))) `(:valid :id ,id :data ,data))
(defun org-x-dag-id->task-status (id) (defun org-x-dag-status-error (id msg)
(cl-flet `(:error :id ,id :msg ,msg))
((to-status
(type data) (defmacro org-x-dag-status>>= (status form)
(org-x-dag-id-action-status id type :task data))) "Treat STATUS like an Either monad.
(let ((kw (org-x-dag-id->todo id))) FORM should take the data of a valid status bound to 'it' and
(-if-let (c (org-x-dag-id->planning-epoch :closed id)) return another status."
(if (member kw org-x-done-keywords) (declare (indent 1))
(->> (if (org-x-dag-time-is-archivable-p c) :archivable :complete) `(pcase ,status
(to-status :status)) (`(:error . ,d) `(:error ,@d))
(to-status :error "Closed id must be marked DONE/CANC")) (`(:valid . ,it) ,form)))
(cond
((member kw org-x-done-keywords) (defmacro org-x-dag-status-with-data (status form)
(to-status :error "Done id's must have closed timestamp")) (declare (indent 1))
(t `(org-x-dag-status>>= status
(to-status :status :active))))))) (-let (((&plist :id it-id :data it-data) it))
,form)))
(defmacro org-x-dag-status-from-data (status form)
(declare (indent 1))
`(pcase ,status
(`(:error . ,_) nil)
(`(:valid . ,d)
(-let (((&plist :id it-id :data it-data) d))
,form))))
(defun org-x-dag-action-status (id action-type code)
;; action types and their codes
;;
;; :task
;; - :archivable
;; - :complete
;; - :active
;;
;; :project
;; - :archivable
;; - :complete
;; - :stuck
;; - :held
;; - :wait
;; - :active
;;
;; :iterator
;; - :archivable
;; - :complete
;; - :empty
;; - :active
;; - :future
;;
;; :iterator-task/project
;; - :archivable
;; - :complete
;; - :active
;; - :future
(org-x-dag-status-valid id (list :code code :action-type action-type)))
(defun org-x-dag-goal-status (id code deadline)
(org-x-dag-status-valid (list :code code :deadline deadline)))
;; (defun org-x-dag-id->task-status (id)
;; (cl-flet
;; ((to-valid
;; (code)
;; (org-x-dag-action-status id :task code))
;; (to-error
;; (msg)
;; (org-x-dag-status-error id msg)))
;; (let ((kw (org-x-dag-id->todo id)))
;; (-if-let (c (org-x-dag-id->planning-epoch :closed id))
;; (if (member kw org-x-done-keywords)
;; (->> (if (org-x-dag-time-is-archivable-p c) :archivable :complete)
;; (to-valid))
;; (to-error "Closed id must be marked DONE/CANC"))
;; (cond
;; ((member kw org-x-done-keywords)
;; (to-error "Done id's must have closed timestamp"))
;; (t
;; (to-valid :active)))))))
(defun org-x-dag-status-is-error-p (status) (defun org-x-dag-status-is-error-p (status)
(eq (car (cdr status)) :error)) (eq (car status) :error))
(defmacro org-x-dag-id->with-child-statuses (id child-statuses task-key (defmacro org-x-dag-id->with-child-statuses (id child-statuses codelist
project-key codetree task-fun) to-valid-form rank-form
(declare (indent 4)) childless-form)
(let ((flat-codes (-map #'car codetree)) (declare (indent 3))
(proj-ranking-tbl (let ((c (make-symbol "--child-statuses"))
(->> codetree (i (make-symbol "--id")))
(--map-indexed `(-if-let (,c ,child-statuses)
(-let* (((key . child-codes) it) (let* ((,i ,id)
(i it-index) (ranks (--map (org-x-dag-status-from-data it ,rank-form)
(trans (--map (cons it i) child-codes)))
(pcase key
(`(:error ,_) trans)
(`(:status ,s) (cons (cons s it-index) trans)))))
(-flatten-n 1))))
`(cl-flet
((to-status
(type data)
(org-x-dag-id-action-status id type :project data)))
(let* ((ranks (--map (-let (((id . status) it))
(pcase status
(`(:error _) nil)
(`(:status (:type ,k :code ,code))
(cl-case k
(,task-key
(alist-get code ',proj-ranking-tbl))
(,project-key
(funcall ,task-fun id code))))))
,child-statuses))) ,child-statuses)))
(if (-any #'null ranks) (if (-any #'null ranks)
(to-status :error "Child error") (org-x-dag-status-error ,i "Child-dependent error")
(->> (nth (-max ranks) ',flat-codes) (pcase (nth (-max ranks) ',codelist)
(apply #'to-status))))))) (`nil (error "Invalid index returned during child translation"))
(`(:error ,msg) (org-x-dag-status-error ,i msg))
(`(:valid ,it) ,to-valid-form))))
,childless-form)))
;; TODO not DRY (defmacro org-x-dag-id->with-action-child-statuses (id child-statuses action-type
(defun org-x-dag-id->iterator-task-status (id) codelist trans-fun
(cl-flet childless-form)
((to-status (declare (indent 3))
(type data) `(org-x-dag-id->with-child-statuses ,id ,child-statuses ,codelist
(org-x-dag-id-action-status id type :task data))) (org-x-dag-action-status ,id ,action-type it)
(let ((kw (org-x-dag-id->todo id))) (-let (((&plist :action-type a :code c) it-data))
(-if-let (c (org-x-dag-id->planning-epoch :closed id)) (funcall ,trans-fun it-id a c))
(if (member kw org-x-done-keywords) ,childless-form))
(->> (if (org-x-dag-time-is-archivable-p c) :archivable :complete)
(to-status :status))
(to-status :error "Closed iterator tasks must be marked DONE/CANC"))
(cond
((member kw org-x-done-keywords)
(to-status :error "Done iterator tasks must have closed timestamp"))
((equal kw org-x-k-todo)
(-if-let (ts (or (org-x-dag-id->planning-epoch :scheduled id)
(org-x-dag-id->planning-epoch :deadline id)))
(if (< org-x-iterator-active-future-offset (- ts (float-time)))
(to-status :status :future)
(to-status :status :active))
(to-status :error "Iterator tasks must be scheduled or deadlined")))
(t
(to-status :error "Iterator tasks cannot have keyword: %s" kw)))))))
(defun org-x-dag-id->iterator-project-status (id) (defun org-x-dag-id->action-status (id in-iteratorp)
(cl-flet (cl-flet*
((to-status ((get-child-statuses
(code) (id iteratorp)
(org-x-dag-id-action-status id :status :project code)) ;; Distinguish between immediate children and all deeper children;
(to-error ;; assume that the car of anything returned by
(msg) ;; `org-x-dag-id->action-status' is the parent of all the status
(org-x-dag-id-action-status id :error :project msg))) ;; objects in the cdr, so map these together
(let ((kw (org-x-dag-id->todo id)) (-let (((shallow deep)
(child-statuses
(->> (org-x-dag-id->buffer-children id) (->> (org-x-dag-id->buffer-children id)
(-mapcat #'org-x-dag-id->iterator-project-status))) (--reduce-from
(status (-let (((child . subchildren)
(cond (org-x-dag-id->action-status it iteratorp))
((not child-statuses) ((acc-children acc-subchildren) acc))
(org-x-dag-id->iterator-task-status id)) `((,child ,@acc-children)
((org-x-dag-id->planning-timestamp :scheduled id) (,@subchildren ,@acc-subchildren)))
(to-error "Iterator project nodes cannot be scheduled")) nil))))
((equal kw org-x-kw-canc) (list shallow deep)))
(to-status :complete)) (to-valid-closed
((equal kw org-x-kw-done) (id type ts)
(org-x-dag-id->with-child-statuses id child-statuses :iterator-task :iterator-project (->> (if (->> (org-ml-timestamp-get-start-time ts)
(((:status :archivable)) (org-ml-time-to-unixtime)
((:status :complete)) (org-x-dag-time-is-archivable-p))
((:error "Complete iterator projects can only have complete children") :archivable
:active :future)) :complete)
(lambda (_ code) (org-x-dag-action-status id type)))
(cl-case code (check-archivable
(:archivable 0) (id closed status)
(:closed 1) (org-x-dag-status-with-data status
(t 2))))) (-let (((&plist :code c :action-type a) it-data))
((equal kw org-x-kw-todo) (if (eq c :archivable)
(org-x-dag-id->with-child-statuses id child-statuses :iterator-task :iterator-project (to-valid-closed id a closed)
(((:error "Open iterator projects need to have at least one active child") (org-x-dag-action-status id a c)))))
:complete :archivable)
((:status :active))
((:status :future)))
(lambda (_ code)
(cl-case code
((:archivable :complete) 0)
(:active 1)
(:future 2)))))
(t
(to-error (format "Iterator projects has invalid keyword: %s" kw))))))
`(,status ,@child-statuses))))
(defun org-x-dag-headline-get-iterator-status (id) (iterator-status
(cl-flet (id kw closed c-statuses)
((to-status
(code)
(org-x-dag-id-action-status id :status :iterator code))
(to-error
(msg)
(org-x-dag-id-action-status id :error :iterator msg)))
(let* ((kw (org-x-dag-id->todo id))
(child-statuses
(->> (org-x-dag-id->buffer-children id)
(-mapcat #'org-x-dag-id->iterator-project-status)))
(this-status
(cond (cond
((not (org-x-dag-id->node-property "ARCHIVE" id)) ((not (org-x-dag-id->node-property "ARCHIVE" id))
(to-error "Iterator must have ARCHIVE set")) (org-x-dag-status-error id "Iterator must have ARCHIVE set"))
((not (org-x-dag-id->node-property org-x-prop-time-shift id)) ((not (org-x-dag-id->node-property org-x-prop-time-shift id))
(to-error "Iterator must have %s set" org-x-prop-time-shift)) (->> (format "Iterator must have %s set" org-x-prop-time-shift)
;; TODO this is set up to assume that iterators will never be (org-x-dag-status-error id)))
;; archived, which is almost true (with almost doing some heavy lifting) ((equal kw org-x-done-keywords)
((not (equal kw org-x-kw-todo)) (->>
(to-error "Iterators can only be marked TODO")) (org-x-dag-id->with-action-child-statuses id c-statuses :iterator
((not child-statuses) ((:valid :archivable)
(to-status :empty)) (:valid :complete)
(t (:error "Complete iterators can only have complete child nodes"))
;; TODO this is utterly gross... (lambda (_ type code)
(let ((s (if (--any-p (pcase (cdr it) (when (memq type '(:iterator-task :iterator-project))
(`(:status (:type ,(or :iterator-task (pcase code
:iterator-proejct)
:code :future))
t))
child-statuses)
:future
:active)))
(to-status s))))))
`(,this-status ,@child-statuses))))
(defun org-x-dag-id->action-status (id)
(cl-flet
((to-status
(code)
(org-x-dag-id-action-status id :status :project code))
(to-error
(msg)
(org-x-dag-id-action-status id :error :project msg)))
(if (org-x-dag-id->is-iterator-p id)
(org-x-dag-headline-get-iterator-status id)
(let* ((keyword (org-x-dag-id->todo id))
(child-statuses (->> (org-x-dag-id->buffer-children id)
(-mapcat #'org-x-dag-id->action-status)))
(this-status
(cond
;; TODO this isn't done for iterators
((org-x-dag-id->any-illegal-p id)
(to-error "Node has illegal links"))
((not (org-x-dag-id->created-in-past-p id))
(to-error "Node must have creation timestamp in the past"))
((org-x-dag-id->is-iterator-p id)
((not child-statuses)
(org-x-dag-id->task-status id))
((org-x-dag-id->planning-timestamp :scheduled id)
(to-error "Projects cannot be scheduled"))
((equal keyword org-x-kw-hold)
(to-status :held))
((member keyword org-x--project-invalid-todostates)
(->> (s-join ", " org-x--project-invalid-todostates)
(format "Projects cannot have these keywords: %s")
(to-error)))
((equal keyword org-x-kw-canc)
(->> (if (org-x-dag-id->is-archivable-p id) :archivable :complete)
(to-status)))
((equal keyword org-x-kw-done)
(org-x-dag-id->with-child-statuses id child-statuses :task :project
(((:status :archivable))
((:status :complete))
((:error "DONE projects can only have complete child nodes")
:stuck :held :wait :active))
(lambda (_ code)
(cl-case code
(:archivable 0) (:archivable 0)
(:complete 1) (:complete 1)
(:active 2))))) ((or :active :future) 2))))
((equal keyword org-x-kw-todo) (org-x-dag-action-status id :iterator :complete))
(org-x-dag-id->with-child-statuses id child-statuses :task :project (check-archivable id closed)))
(((:error "TODO projects should have at least one active child") ((equal kw org-x-kw-todo)
:archivable :complete) (org-x-dag-id->with-action-child-statuses id c-statuses :iterator
((:status :stuck)) ((:valid :empty)
((:status :held)) (:valid :active)
((:status :wait)) (:valid :future))
((:status :active))) (lambda (_ type code)
(lambda (id _) (when (memq type '(:iterator-task :iterator-project))
(pcase code
((or :archivable :complete) 0)
(:active 1)
(:future 2))))
(org-x-dag-action-status id :iterator :empty)))
(t
(funcall to-error "Iterator can only have DONE/CANC/TODO keywords"))))
(iterator-project-status
(id kw closed c-statuses)
(cond
((equal kw org-x-kw-done)
(->>
(org-x-dag-id->with-action-child-statuses id c-statuses :iterator-project
((:valid :archivable)
(:valid :complete)
(:error "Complete iterator projects can only have complete children"))
(lambda (_ type code)
(when (memq type '(:iterator-task :iterator-project))
(pcase code
(:archivable 0)
(:complete 1)
((or :active :future) 2))))
(to-valid-closed id :iterator-task closed))
(check-archivable id closed)))
((equal kw org-x-kw-todo)
(org-x-dag-id->with-action-child-statuses id c-statuses :iterator-project
((:error "Open iterator projects must have at least one active child")
(:valid :active)
(:valid :future))
(lambda (_ type code)
(when (memq type '(:iterator-project :iterator-task))
(pcase code
((or :archivable :complete) 0)
(:active 1)
(:future 2))))
(-if-let (ts (or (org-x-dag-id->planning-epoch :scheduled id)
(org-x-dag-id->planning-epoch :deadline id)))
(let ((code (if (< org-x-iterator-active-future-offset
(- ts (float-time)))
:future :active)))
(org-x-dag-action-status id :iterator-task code))
(->> "Iterator tasks must be scheduled or deadlined"
(org-x-dag-status-error id)))))
(t
(->> (format "Iterated action has invalid keyword: %s" kw)
(org-x-dag-status-error id)))))
(project-status
(id kw closed c-statuses)
(cond
((equal kw org-x-kw-done)
(->>
(org-x-dag-id->with-action-child-statuses id c-statuses :project
((:valid :archivable)
(:valid :complete)
(:error "DONE projects can only have complete child nodes"))
;; TODO figure out what to do when a key doesn't match, it
;; should make an error but not sure if it should be a
;; runtime error or a returned status error
(lambda (_ type code)
(pcase `(,type ,code)
(`(,_ :archivable) 0)
(`(,_ :complete) 1)
(`(:project ,(or :stuck :held :wait :active)) 2)
(`(:task :active) 2)
(`(:iterator ,(or :active :future :empty) 2))
(e (error "Invalid task/code combination: %S" e))))
(to-valid-closed id :task closed))
(check-archivable id closed)))
((equal kw org-x-kw-todo)
(org-x-dag-id->with-action-child-statuses id c-statuses :project
((:error "TODO projects should have at least one active child")
(:valid :stuck)
(:valid :held)
(:valid :wait)
(:valid :active))
(lambda (id type code)
(pcase `(,type ,code)
(`(,_ ,(or :archivable :complete)) 0)
(`(:project :stuck) 1)
(`(:project :held) 2)
(`(:project :wait) 3)
(`(:project :active) 4)
(`(:task ,_)
(let ((kw (org-x-dag-id->todo id))) (let ((kw (org-x-dag-id->todo id)))
(cond (cond
((equal kw org-x-kw-todo)
(if (org-x-dag-id->planning-timestamp :scheduled id) 4 1))
((equal kw org-x-kw-hold) 2) ((equal kw org-x-kw-hold) 2)
((equal kw org-x-kw-wait) 3) ((equal kw org-x-kw-wait) 3)
((equal kw org-x-kw-next) 4) ((equal kw org-x-kw-next) 4)
;; ASSUME anything that doesn't have the above keywords ((equal kw org-x-kw-todo)
;; is either :archivable or :complete in which case it (if (org-x-dag-id->planning-timestamp :scheduled id)
;; is an error 4 1))
(t 0)))))) (t
(t (error "Could not determine status for '%s'" id)))))) (error "Could not translate task with keyword: %s" kw)))))
`(,this-status ,@child-statuses))))) (`(:iterator ,(or :active :empty)) 1)
(`(:iterator :future) 4)
(e (error "Invalid task/code combination: %S" e))))
(org-x-dag-action-status id :task :active)))
(t
(if c-statuses
(if (equal kw org-x-kw-hold)
(org-x-dag-action-status id :project :held)
(->> (format "Projects cannot be marked %s" kw)
(org-x-dag-status-error)))
(org-x-dag-action-status id :task :active))))))
(defun org-x-dag-id->endpoint-status (id) (-let* ((kw (org-x-dag-id->todo id))
()) (closed (org-x-dag-id->planning-timestamp :closed id))
(iteratorp (org-x-dag-id->is-iterator-p id))
((c-statuses subc-statuses) (get-child-statuses id iteratorp))
(this-status
;; first check for a bunch of errors that are equally valid at any
;; level in the DAG
(-if-let (general-error
(cond
((org-x-dag-id->any-illegal-p id)
"Action has illegal links")
((not (org-x-dag-id->created-in-past-p id))
"Action must have creation timestamp in the past")
((and closed (not (member kw org-x-done-keywords)))
"Closed actions must be marked with DONE/CANC")
((and (not closed) (member kw org-x-done-keywords))
"DONE/CANC actions must have closed timestamp")
((and c-statuses
(org-x-dag-id->planning-timestamp :scheduled id))
"Actions with children cannot be scheduled")
((and c-statuses
(org-x-dag-id->planning-timestamp :deadline id))
"Actions with children cannot be deadlined")
((and iteratorp in-iteratorp)
"Iterators cannot be nested")))
(org-x-dag-status-error id general-error)
(cond
;; CANC actions work the same regardless of action type; if the
;; closed timestamp is archivable, its :archivable, otherwise it
;; is :complete (NOTE that this is 'nice' because I made it such
;; that :complete and :archivable have the same meaning and key
;; for all action types)
((equal kw org-x-kw-canc)
(let ((type (cond
(iteratorp :iterator)
(in-iteratorp
(if c-statuses :iterator-project :iterator-task))
(t
(if c-statuses :project :task)))))
(to-valid-closed id type closed)))
;; assuming none of the general checks above matched, try more
;; specific checks depending on if the current action is an
;; iterator (and if we are inside one)
(iteratorp
(iterator-status id kw closed c-statuses))
(in-iteratorp
(iterator-project-status id kw closed c-statuses))
(t
(project-status id kw closed c-statuses))))))
`(,this-status ,@c-statuses ,@subc-statuses))))
(defun org-x-dag-id->has-done-error-p (id)
(or (and (not (org-x-dag-id->is-done-p id)) (org-x-dag-id->is-closed-p id))
(and (org-x-dag-id->is-done-p id) (not (org-x-dag-id->is-closed-p id)))))
(defun org-x-dag-status-check-todo-or-done (id to-error alt-fun)
(declare (indent 2))
(org-x-dag-status-check-done id kw to-error
(lambda (id)
(let ((kw (org-x-dag-id->todo id)))
(if (equal kw org-x-kw-todo)
(to-error "Keyword must be marked TODO/DONE")
(funcall alt-fun id))))))
;; (defun org-x-dag-id->endpoint-status (id)
;; (cl-flet
;; ((to-status
;; (type code)
;; (org-x-dag-goal-status id :status type code))
;; (to-error
;; (type msg)
;; (org-x-dag-goal-status id :error type msg)))
;; (let ((child-statuses (->> (org-x-dag-id->buffer-children id)
;; (-mapcat #'org-x-dag-id->endpoint-status)))
;; (this-status
;; (cond
;; ((org-x-dag-id->has-done-error-p id)
;; (to-error :branch "Closed timestamps must have DONE/CANC"))
;; ((org-x-dag-id->planning-timestamp :scheduled id)
;; (to-error :branch "Endpoint goals cannot be scheduled"))
;; ((equal kw org-x-kw-todo)
;; (to-status :branch :active))
;; ((org-x-dag-id->is-done-p id)
;; (to-status :branch :complete))
;; ((not children)
;; ())))
;; `(,this-status ,@child-statuses)))))
(defun org-x-dag-id->file-level-status (id) (defun org-x-dag-id->file-level-status (id)
"Return file-level status of ID and its children. "Return file-level status of ID and its children.