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

Add: Timestamp selectors :on a number

Browse source 
This ought to be pretty thorough now.
This commit is contained in:
Adam Porter 2019-08-18 22:57:38 -05:00
parent c2ecbc67a5
commit 49d0fa8306
3 changed files with 90 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

35
org-ql.el
View file

@ -313,14 +313,45 @@ Replaces bare strings with (regexp) selectors, and appropriate
(ts-apply :hour 23 :minute 59 :second 59))))
`(,pred :to ,to)))
(`(,(and pred (or 'deadline 'scheduled 'planning))
,(and type (or :from :to :on))
,(and direction (or :from :to :on))
,(and num-days (pred numberp)))
(let ((target (->> (ts-now)
(ts-adjust 'day num-days)
(ts-apply :hour 23 :minute 59 :second 59))))
`(,pred ,type ,target)))
`(,pred ,direction ,target)))
(`(,(and pred (or 'ts 'ts-a 'ts-i 'ts-active 'ts-inactive))
,(and direction (or :from :to))
,(and num-days (pred numberp)))
(-let* ((type (pcase-exhaustive pred
((or 'ts-i 'ts-inactive) 'inactive)
((or 'ts-a 'ts-active) 'active)
('ts 'both)))
((hour minute second) (pcase-exhaustive direction
(:from '(0 0 0))
(:to '(23 59 59))))
(ts (->> (ts-now)
(ts-adjust 'day num-days)
(ts-apply :hour hour :minute minute :second second))))
`(ts :type ,type ,direction ,ts)))
(`(,(and pred (or 'ts 'ts-a 'ts-i 'ts-active 'ts-inactive))
:on
,(and num-days (pred numberp)))
;; This rule is only for :on, because we must provide both :from and :to
;; timestamps to the (ts) selector for the --query-predicate function.
(-let* ((type (pcase-exhaustive pred
((or 'ts-i 'ts-inactive) 'inactive)
((or 'ts-a 'ts-active) 'active)
('ts 'both)))
(from (->> (ts-now)
(ts-adjust 'day num-days)
(ts-apply :hour 0 :minute 0 :second 0)))
(to (->> (ts-now)
(ts-adjust 'day num-days)
(ts-apply :hour 23 :minute 59 :second 59))))
`(ts :type ,type :from ,from :to ,to)))
(`(,(or 'ts-active 'ts-a) . ,rest) `(ts :type active ,@rest))
(`(,(or 'ts-inactive 'ts-i) . ,rest) `(ts :type inactive ,@rest))
;; Any other form: passed through unchanged.
(_ element))))
(rec query)))