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

REF factor out read-string bits

This commit is contained in:
Nathan Dwarshuis 2021-04-20 00:51:06 -04:00
parent ffdbbb5ee0
commit 734c2e84b4
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
local/lib/org-x/org-x.el
View File

@ -807,6 +807,14 @@ function will simply return the point of the next headline."
;; timestamp shifting ;; timestamp shifting
(defun org-x--read-number-from-minibuffer (prompt &optional return-str)
"Read a number from the minibuffer using PROMPT.
If RETURN-STR is t, return the string and not the number."
(let ((out (read-string (format "%s: " prompt))))
(if (s-matches-p "[0-9]+" out)
(if return-str out (string-to-number out))
(error "Not a valid number: %s" out))))
(defun org-x--read-shift-from-minibuffer (&optional default) (defun org-x--read-shift-from-minibuffer (&optional default)
"Read a timestamp shift from the minibuffer. "Read a timestamp shift from the minibuffer.
@ -987,10 +995,9 @@ ARG, ask for a range in minutes in place of the second date."
(round (float-time (org-read-date t t nil nil default-time)))) (round (float-time (org-read-date t t nil nil default-time))))
(read-duration (read-duration
(start-epoch) (start-epoch)
(let ((out (read-string "Length in minutes: "))) (->> (org-x--read-number-from-minibuffer "Length in minutes")
(if (not (s-match "[0-9]+" out)) (* 60)
(error "Invalid duration: %s" out) (+ start-epoch))))
(+ start-epoch (* 60 (string-to-number)))))))
(let* ((t1 (read-date nil)) (let* ((t1 (read-date nil))
(t2 (if (equal arg '(4)) (read-duration t1) (read-date t1)))) (t2 (if (equal arg '(4)) (read-duration t1) (read-date t1))))
(if (< t2 t1) (message "Second timestamp earlier than first!") (if (< t2 t1) (message "Second timestamp earlier than first!")
@ -1289,12 +1296,10 @@ If ARG is non-nil use long timestamp format."
(defun org-x-set-dtl () (defun org-x-set-dtl ()
"Set days-to-live of the current headline." "Set days-to-live of the current headline."
(interactive) (interactive)
(let ((n (read-string "Days to live: "))) (let ((np (->> (org-x--read-number-from-minibuffer "Days to live" t)
(if (not (s-matches-p "[0-9]+" n)) (org-ml-build-node-property org-x-prop-days-to-live))))
(message "Enter a number") (org-ml-update-this-headline*
(let ((np (org-ml-build-node-property org-x-prop-days-to-live n))) (org-ml-headline-map-node-properties* (cons np it) it))))
(org-ml-update-this-headline*
(org-ml-headline-map-node-properties* (cons np it) it))))))
(advice-add 'org-insert-heading :after #'org-x-set-creation-time) (advice-add 'org-insert-heading :after #'org-x-set-creation-time)