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

Fix: Restore date predicate

Browse source 
Need to deprecate with a warning and update examples before removing.

Fixes #25.  Closes #26.  Thanks to @xeijin for reporting.
This commit is contained in:
Adam Porter 2019-06-09 14:34:38 -05:00
parent c40eb050a9
commit 9b5004b436
1 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

104
org-ql.el
View file

@ -690,58 +690,58 @@ COMPARATOR should be a function (like `<=')."
;; NOTE: This was a defsubst before being defined with the macro. Might be good to make it a defsubst again. ;; NOTE: This was a defsubst before being defined with the macro. Might be good to make it a defsubst again.
(org-ql--date-type-p :closed comparator target-date)) (org-ql--date-type-p :closed comparator target-date))
;; (org-ql--defpredicate date (&optional comparator target-date (type 'active)) (org-ql--defpredicate date (&optional comparator target-date (type 'active))
;; "Return non-nil if Org entry at point has date of TYPE that compares with TARGET-DATE using COMPARATOR. "Return non-nil if Org entry at point has date of TYPE that compares with TARGET-DATE using COMPARATOR.
;; Checks all Org-formatted timestamp strings in entry. TYPE may be Checks all Org-formatted timestamp strings in entry. TYPE may be
;; `active', `inactive', or `all', to control whether active, `active', `inactive', or `all', to control whether active,
;; inactive, or all timestamps are checked. Ranges of each type are inactive, or all timestamps are checked. Ranges of each type are
;; also checked. TARGET-DATE should be a string parseable by also checked. TARGET-DATE should be a string parseable by
;; `date-to-day'. COMPARATOR should be a function (like `<=')." `date-to-day'. COMPARATOR should be a function (like `<=')."
;; ;; NOTE: I think the `ts' predicate obsoletes this, but I'm leaving it commented for now. ;; TODO: Deprecate this with a warning, suggest using (ts) instead, and remove (date) from examples.
;; ;; MAYBE: This duplicates some code in --date-p, maybe it could be refactored DRYer. ;; MAYBE: This duplicates some code in --date-p, maybe it could be refactored DRYer.
;; (let* ((entry-timestamps (save-excursion (let* ((entry-timestamps (save-excursion
;; ;; NOTE: It's important to `save-excursion', otherwise the point will be moved, which will ;; NOTE: It's important to `save-excursion', otherwise the point will be moved, which will
;; ;; likely cause the action function to fail. We could wrap the call to the predicate in ;; likely cause the action function to fail. We could wrap the call to the predicate in
;; ;; `save-excursion', but that would do it even when not necessary, which would be slower. ;; `save-excursion', but that would do it even when not necessary, which would be slower.
;; (cl-loop while (re-search-forward org-element--timestamp-regexp (org-entry-end-position) t) (cl-loop while (re-search-forward org-element--timestamp-regexp (org-entry-end-position) t)
;; collect (match-string 0))))) collect (match-string 0)))))
;; (pcase comparator (pcase comparator
;; ('nil (pcase type ('nil (pcase type
;; ('all entry-timestamps) ('all entry-timestamps)
;; ('active (cl-loop for timestamp in entry-timestamps ('active (cl-loop for timestamp in entry-timestamps
;; thereis (string-prefix-p "<" timestamp))) thereis (string-prefix-p "<" timestamp)))
;; ('inactive (cl-loop for timestamp in entry-timestamps ('inactive (cl-loop for timestamp in entry-timestamps
;; thereis (string-prefix-p "[" timestamp))) thereis (string-prefix-p "[" timestamp)))
;; (_ (user-error "Invalid type for date selector. May be `active', `inactive', or `all'")))) (_ (user-error "Invalid type for date selector. May be `active', `inactive', or `all'"))))
;; ((pred functionp) ((pred functionp)
;; ;; TODO: Avoid computing target-day-number every time this is called. ;; TODO: Avoid computing target-day-number every time this is called.
;; ;; Probably need to make a lambda that has it already defined. ;; Probably need to make a lambda that has it already defined.
;; (let ((target-day-number (cl-typecase target-date (let ((target-day-number (cl-typecase target-date
;; (null nil) ; Calculated later. (null nil) ; Calculated later.
;; ;; Append time to target-date because `date-to-day' requires it. ;; Append time to target-date because `date-to-day' requires it.
;; (string (date-to-day (concat target-date " 00:00"))) (string (date-to-day (concat target-date " 00:00")))
;; (integer target-date)))) (integer target-date))))
;; (cl-loop for timestamp in entry-timestamps (cl-loop for timestamp in entry-timestamps
;; for date-element = (with-temp-buffer for date-element = (with-temp-buffer
;; ;; MAYBE: Replace with ts.el eventually. ;; MAYBE: Replace with ts.el eventually.
;; ;; TODO: Parse the element in the re-search-forward loop. ;; TODO: Parse the element in the re-search-forward loop.
;; (insert timestamp) (insert timestamp)
;; (goto-char 0) (goto-char 0)
;; (org-element-timestamp-parser)) (org-element-timestamp-parser))
;; for this-target-day-number = (or target-day-number for this-target-day-number = (or target-day-number
;; ;; FIXME: Not sure if it makes sense to check warning ;; FIXME: Not sure if it makes sense to check warning
;; ;; days for non-planning timestamps, but we'll try it. ;; days for non-planning timestamps, but we'll try it.
;; (+ (org-get-wdays timestamp) (org-today))) (+ (org-get-wdays timestamp) (org-today)))
;; thereis (when (or (eq 'all type) thereis (when (or (eq 'all type)
;; (member (org-element-property :type date-element) (member (org-element-property :type date-element)
;; (pcase type (pcase type
;; ('active '(active active-range)) ('active '(active active-range))
;; ('inactive '(inactive inactive-range))))) ('inactive '(inactive inactive-range)))))
;; (funcall comparator (org-time-string-to-absolute (funcall comparator (org-time-string-to-absolute
;; (org-element-timestamp-interpreter date-element 'ignore)) (org-element-timestamp-interpreter date-element 'ignore))
;; this-target-day-number))))) this-target-day-number)))))
;; (_ (user-error "COMPARATOR (%s) must be a function, and DATE (%s) must be a string or day-number integer" (_ (user-error "COMPARATOR (%s) must be a function, and DATE (%s) must be a string or day-number integer"
;; comparator target-date))))) comparator target-date)))))
;;;;; Sorting ;;;;; Sorting