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

WIP

Browse source
This commit is contained in:
Adam Porter 2020-12-20 08:51:39 -06:00
parent eedbb60a77
commit d0c3472de6
1 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
org-ql.el
View file

@ -1772,13 +1772,27 @@ If ON, return non-nil if entry has a timestamp on date ON.
FROM, TO, and ON should be either `ts' structs, or strings FROM, TO, and ON should be either `ts' structs, or strings
parseable by `parse-time-string' which may omit the time value." parseable by `parse-time-string' which may omit the time value."
:normalizers ((`(,predicate-names ,(and num-days (pred numberp))) :normalizers
(let ((to (->> (ts-now) ((`(,predicate-names ,(and num-days (pred numberp)))
(ts-adjust 'day num-days) (let ((to (->> (ts-now)
(ts-apply :hour 23 :minute 59 :second 59)))) (ts-adjust 'day num-days)
`(planning :to ,to)))) (ts-apply :hour 23 :minute 59 :second 59))))
:preambles ((`(,predicate-names . ,_) `(planning :to ,to))))
(list :regexp org-ql-planning-regexp :query query))) :preambles
((`(,predicate-names . ,(and rest (guard (or (plist-get rest :from)
(plist-get rest :to)
(plist-get rest :on)))))
;; Use date-optimized timestamp regexp.
(-let (((&plist :from :to :on :type) rest))
(org-ql--from-to-on)
(list :regexp (-let* ((from (or from (ts-adjust 'day (- org-ql-ts-days-from-default) (ts-now))))
(to (or to (ts-adjust 'day org-ql-ts-days-to-default (ts-now))))
(ts-regexp (org-ql--ts-range-to-regexp from to)))
(rx-to-string `(seq bow (0+ blank) (or "CLOSED" "DEADLINE" "SCHEDULED") ":"
(1+ blank) (regexp ,ts-regexp))))
:query query)))
(`(,predicate-names . ,_)
(list :regexp org-ql-planning-regexp :query query)))
:body :body
(org-ql--predicate-ts :from from :to to :regexp org-ql-planning-regexp :match-group 1 (org-ql--predicate-ts :from from :to to :regexp org-ql-planning-regexp :match-group 1
:limit (line-end-position 2))) :limit (line-end-position 2)))
@ -1809,6 +1823,7 @@ parseable by `parse-time-string' which may omit the time value."
((`(,predicate-names . ,(and rest (guard (or (plist-get rest :from) ((`(,predicate-names . ,(and rest (guard (or (plist-get rest :from)
(plist-get rest :to) (plist-get rest :to)
(plist-get rest :on))))) (plist-get rest :on)))))
;; Use date-optimized timestamp regexp.
(-let (((&plist :from :to :on :type) rest)) (-let (((&plist :from :to :on :type) rest))
(org-ql--from-to-on) (org-ql--from-to-on)
(list :regexp (-let* ((from (or from (ts-adjust 'day (- org-ql-ts-days-from-default) (ts-now)))) (list :regexp (-let* ((from (or from (ts-adjust 'day (- org-ql-ts-days-from-default) (ts-now))))
@ -1859,6 +1874,7 @@ of the line after the heading."
((`(,predicate-names . ,(and rest (guard (or (plist-get rest :from) ((`(,predicate-names . ,(and rest (guard (or (plist-get rest :from)
(plist-get rest :to) (plist-get rest :to)
(plist-get rest :on))))) (plist-get rest :on)))))
;; Use date-optimized timestamp regexp.
(-let (((&plist :from :to :on :type) rest)) (-let (((&plist :from :to :on :type) rest))
(org-ql--from-to-on) (org-ql--from-to-on)
(list :regexp (-let* ((from (or from (ts-adjust 'day (- org-ql-ts-days-from-default) (ts-now)))) (list :regexp (-let* ((from (or from (ts-adjust 'day (- org-ql-ts-days-from-default) (ts-now))))