Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions calfw-org.el
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
(require 'org-capture)
(require 'google-maps nil t)

(require 's)

(defgroup cfw-org nil
"Options about calfw-org."
:tag "Calfw Org"
Expand Down Expand Up @@ -231,22 +233,19 @@ If this function splits into a list of string, the calfw displays those string i
If TEXT does not have a range, return nil."
(let* ((dotime (cfw:org-tp text 'dotime)))
(and (stringp dotime) (string-match org-ts-regexp dotime)
(let ((date-string (match-string 1 dotime))
(let* ((matches (s-match-strings-all org-ts-regexp dotime))
(start-date (nth 1 (car matches)))
(end-date (nth 1 (nth 1 matches)))
(extra (cfw:org-tp text 'extra)))
(if (string-match "(\\([0-9]+\\)/\\([0-9]+\\)): " extra)
(let* ((cur-day (string-to-number
(match-string 1 extra)))
(total-days (string-to-number
(match-string 2 extra)))
(start-date (time-subtract
(org-read-date nil t date-string)
(seconds-to-time (* 3600 24 (- cur-day 1)))))
(end-date (time-add
(org-read-date nil t date-string)
(seconds-to-time (* 3600 24 (- total-days cur-day))))))
(list (calendar-gregorian-from-absolute (time-to-days start-date))
(calendar-gregorian-from-absolute (time-to-days end-date)) text))
)))))
( list( calendar-gregorian-from-absolute
(time-to-days
(org-read-date nil t start-date))
)
(calendar-gregorian-from-absolute
(time-to-days
(org-read-date nil t end-date))) text)
)))))

(defun cfw:org-schedule-period-to-calendar (begin end)
"[internal] Return calfw calendar items between BEGIN and END
Expand Down
Loading