awesome-emacs/org-roam
1
0
Fork 0
mirror of https://github.com/org-roam/org-roam synced 2025-09-28 16:50:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

(breaking): simplify org-roam-capture

Browse Source 
:file-name to contain extension. Specify ~.org.gpg~ to default to
encrypted, or ~.md~, if you wish to not use Org-mode...
This commit is contained in:
Jethro Kuan
2021-04-03 20:05:23 +08:00
parent fb27fc78bc
commit 4e5a21d7e3
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
org-roam-capture.el
View File

@@ -42,7 +42,6 @@
(defvar org-roam-encrypt-files) (defvar org-roam-encrypt-files)
(defvar org-roam-directory) (defvar org-roam-directory)
(defvar org-roam-title-to-slug-function) (defvar org-roam-title-to-slug-function)
(defvar org-roam-file-extensions)
(defvar org-roam-capture--file-path nil (defvar org-roam-capture--file-path nil
"The file path for the Org-roam capture. "The file path for the Org-roam capture.
@@ -75,7 +74,7 @@ note with the given `ref'.")
(defcustom org-roam-capture-templates (defcustom org-roam-capture-templates
`(("d" "default" plain (function org-roam-capture--get-point) `(("d" "default" plain (function org-roam-capture--get-point)
"%?" "%?"
:file-name "%<%Y%m%d%H%M%S>-${slug}" :file-name "%<%Y%m%d%H%M%S>-${slug}.org"
:head "#+title: ${title}\n" :head "#+title: ${title}\n"
:unnarrowed t)) :unnarrowed t))
"Capture templates for Org-roam. "Capture templates for Org-roam.
@@ -336,17 +335,6 @@ The file is saved if the original value of :no-save is not t and
(with-current-buffer (org-capture-get :buffer) (with-current-buffer (org-capture-get :buffer)
(save-buffer))))) (save-buffer)))))
(defun org-roam-capture--get-file-path (basename)
"Return path for Org-roam file with BASENAME."
(let* ((ext (or (car org-roam-file-extensions)
"org"))
(file (concat basename "." ext)))
(expand-file-name
(if org-roam-encrypt-files
(concat file ".gpg")
file)
org-roam-directory)))
(defun org-roam-capture--new-file (&optional allow-existing-file-p) (defun org-roam-capture--new-file (&optional allow-existing-file-p)
"Return the path to file during an Org-roam capture. "Return the path to file during an Org-roam capture.
@@ -369,11 +357,9 @@ the file if the original value of :no-save is not t and
`org-note-abort' is not t." `org-note-abort' is not t."
(let* ((name-templ (or (org-roam-capture--get :file-name) (let* ((name-templ (or (org-roam-capture--get :file-name)
(user-error "Template needs to specify `:file-name'"))) (user-error "Template needs to specify `:file-name'")))
(new-id (s-trim (org-roam-capture--fill-template (rel-filename (s-trim (org-roam-capture--fill-template name-templ)))
name-templ))) (file-path (expand-file-name rel-filename org-roam-directory))
(file-path (org-roam-capture--get-file-path new-id)) (roam-head (or (org-roam-capture--get :head) ""))
(roam-head (or (org-roam-capture--get :head)
""))
(org-template (org-capture-get :template)) (org-template (org-capture-get :template))
(roam-template (concat roam-head org-template))) (roam-template (concat roam-head org-template)))
(if (or (file-exists-p file-path) (if (or (file-exists-p file-path)