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

(fix): fix org-roam-today date functionality overriding old files (#235)

Browse source
This commit is contained in:
Jethro Kuan 2020-03-06 19:35:22 +08:00 committed by GitHub
parent b1e2209dfc
commit 4c6e4df474
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
org-roam.el
View file

@ -577,17 +577,14 @@ specified via the #+ROAM_ALIAS property."
(s-downcase slug))))
;;;; Org-roam capture
(defun org-roam--new-file-path (id)
"The file path for a new Org-roam file, with identifier ID.
If ABSOLUTE, return an absolute file-path. Else, return a
relative file-path."
(let ((absolute-file-path (file-truename
(expand-file-name
(if org-roam-encrypt-files
(concat id ".org.gpg")
(concat id ".org"))
org-roam-directory))))
absolute-file-path))
(defun org-roam--file-path-from-id (id)
"The file path for an Org-roam file, with identifier ID."
(file-truename
(expand-file-name
(if org-roam-encrypt-files
(concat id ".org.gpg")
(concat id ".org"))
org-roam-directory)))
(defvar org-roam--capture-file-name-default "%<%Y%m%d%H%M%S>"
"The default file name format for org-roam templates.")
@ -661,7 +658,9 @@ currently active org-roam template. Returns the path to the new file."
(new-id (s-trim (org-roam--fill-template
name-templ
org-roam--capture-info)))
(file-path (org-roam--new-file-path new-id)))
(file-path (org-roam--file-path-from-id new-id)))
(when (file-exists-p file-path)
(error (format "File exists at %s, aborting." file-path)))
(org-roam--touch-file file-path)
(write-region
(org-roam--fill-template (or (org-capture-get :head)
@ -844,14 +843,17 @@ INFO is an alist containing additional information."
(defun org-roam--file-for-time (time)
"Create and find file for TIME."
(let* ((title (format-time-string "%Y-%m-%d" time))
(org-roam-capture-templates (list (list "d" "daily" 'plain (list 'function #'org-roam--capture-get-point)
""
:immediate-finish t
:file-name "${title}"
:head "#+TITLE: ${title}")))
(org-roam--capture-context 'title)
(org-roam--capture-info (list (cons 'title title))))
(org-roam-capture)))
(file-path (org-roam--file-path-from-id title)))
(if (file-exists-p file-path)
file-path
(let ((org-roam-capture-templates (list (list "d" "daily" 'plain (list 'function #'org-roam--capture-get-point)
""
:immediate-finish t
:file-name "${title}"
:head "#+TITLE: ${title}")))
(org-roam--capture-context 'title)
(org-roam--capture-info (list (cons 'title title))))
(org-roam-capture)))))
(defun org-roam-today ()
"Create and find file for today."