awesome-emacs/org-roam
1
0
Fork 0
mirror of https://github.com/org-roam/org-roam synced 2025-08-01 12:17:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

(refactor): refactor org-roam-capture (#1355)

Browse Source
This commit is contained in:
Jethro Kuan
2020-12-22 21:57:02 +08:00
committed by GitHub
parent 777f6d23ec
commit 48e195dd82
3 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
org-roam-capture.el
View File

@ -41,10 +41,10 @@
(defvar org-roam-directory) (defvar org-roam-directory)
(defvar org-roam-mode) (defvar org-roam-mode)
(defvar org-roam-title-to-slug-function) (defvar org-roam-title-to-slug-function)
(defvar org-roam-file-extensions)
(declare-function org-roam--get-title-path-completions "org-roam") (declare-function org-roam--get-title-path-completions "org-roam")
(declare-function org-roam--get-ref-path-completions "org-roam") (declare-function org-roam--get-ref-path-completions "org-roam")
(declare-function org-roam--file-path-from-id "org-roam")
(declare-function org-roam--find-file "org-roam") (declare-function org-roam--find-file "org-roam")
(declare-function org-roam-format-link "org-roam") (declare-function org-roam-format-link "org-roam")
(declare-function org-roam-mode "org-roam") (declare-function org-roam-mode "org-roam")
@ -388,6 +388,17 @@ 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 () (defun org-roam-capture--new-file ()
"Return the path to the new file during an Org-roam capture. "Return the path to the new file during an Org-roam capture.
@ -413,16 +424,13 @@ the file if the original value of :no-save is not t and
(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 (new-id (s-trim (org-roam-capture--fill-template
name-templ))) name-templ)))
(file-path (org-roam--file-path-from-id new-id)) (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)))
(unless (or (file-exists-p file-path) (unless (or (file-exists-p file-path)
(cl-some (lambda (buffer) (find-buffer-visiting file-path))
(string= (buffer-file-name buffer)
file-path))
(buffer-list)))
(make-directory (file-name-directory file-path) t) (make-directory (file-name-directory file-path) t)
(org-roam-capture--put :orig-no-save (org-capture-get :no-save) (org-roam-capture--put :orig-no-save (org-capture-get :no-save)
:new-file t) :new-file t)

1
org-roam-dailies.el
View File

@ -43,7 +43,6 @@
(defvar org-roam-mode) (defvar org-roam-mode)
(defvar org-roam-directory) (defvar org-roam-directory)
(declare-function org-roam--org-file-p "org-roam") (declare-function org-roam--org-file-p "org-roam")
(declare-function org-roam--file-path-from-id "org-roam")
(declare-function org-roam--find-file "org-roam") (declare-function org-roam--find-file "org-roam")
(declare-function org-roam-mode "org-roam") (declare-function org-roam-mode "org-roam")

11
org-roam.el
View File

@ -982,17 +982,6 @@ Return nil if the file does not exist."
(org-roam--org-roam-file-p (buffer-file-name it))) (org-roam--org-roam-file-p (buffer-file-name it)))
(buffer-list))) (buffer-list)))
(defun org-roam--file-path-from-id (id)
"Return path for Org-roam file with ID."
(let* ((ext (or (car org-roam-file-extensions)
"org"))
(file (concat id "." ext)))
(expand-file-name
(if org-roam-encrypt-files
(concat file ".gpg")
file)
org-roam-directory)))
;;; org-roam-backlinks-mode ;;; org-roam-backlinks-mode
(define-minor-mode org-roam-backlinks-mode (define-minor-mode org-roam-backlinks-mode
"Minor mode for the `org-roam-buffer'. "Minor mode for the `org-roam-buffer'.