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

pass node separately

Browse Source
This commit is contained in:
Jethro Kuan
2021-04-11 21:28:18 +08:00
parent a527560cf4
commit a1710b41b3
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
org-roam-capture.el
View File

@ -41,6 +41,10 @@
;; Declarations ;; Declarations
(defvar org-roam-directory) (defvar org-roam-directory)
(defvar org-roam-capture--node nil
"The node passed during an Org-roam capture. This variable is populated dynamically, and is only non-nil
during the Org-roam capture process.")
(defvar org-roam-capture--info nil (defvar org-roam-capture--info nil
"A property-list of additional information passed to the Org-roam template. "A property-list of additional information passed to the Org-roam template.
This variable is populated dynamically, and is only non-nil This variable is populated dynamically, and is only non-nil
@ -188,14 +192,13 @@ This is an extension of org-capture's template expansion.
First, it expands ${var} occurrences in STR, using the node in First, it expands ${var} occurrences in STR, using the node in
`org-roam-capture--info'. Next, it expands the remaining template `org-roam-capture--info'. Next, it expands the remaining template
string using `org-capture-fill-template'." string using `org-capture-fill-template'."
(let ((node (plist-get org-roam-capture--info :node))) (org-capture-fill-template
(org-capture-fill-template (s-format str
(s-format str (lambda (key)
(lambda (key) (let ((fn (intern (concat "org-roam-node-" key))))
(let ((fn (intern (concat "org-roam-node-" key)))) (if (fboundp fn)
(if (fboundp fn) (funcall fn org-roam-capture--node)
(funcall fn node) (completing-read (format "%s: " key) nil)))))))
(completing-read (format "%s: " key) nil))))))))
(defun org-roam-capture--save-file-maybe () (defun org-roam-capture--save-file-maybe ()
"Save the file conditionally. "Save the file conditionally.
@ -305,8 +308,7 @@ you can catch it with `condition-case'."
"Return exact point to file for org-capture-template. "Return exact point to file for org-capture-template.
This function is used solely in Org-roam's capture templates: see This function is used solely in Org-roam's capture templates: see
`org-roam-capture-templates'." `org-roam-capture-templates'."
(let* ((node (plist-get org-roam-capture--info :node)) (let* ((file-path
(file-path
(cond ((plist-get org-roam-capture--info :ref) (cond ((plist-get org-roam-capture--info :ref)
(or (caar (org-roam-db-query [:select [file] (or (caar (org-roam-db-query [:select [file]
:from refs :from refs
@ -314,8 +316,8 @@ This function is used solely in Org-roam's capture templates: see
:limit 1] :limit 1]
(plist-get org-roam-capture--info :ref))) (plist-get org-roam-capture--info :ref)))
(org-roam-capture--new-file))) (org-roam-capture--new-file)))
((org-roam-node-file node) ((org-roam-node-file org-roam-capture--node)
(org-roam-node-file node)) (org-roam-node-file org-roam-capture--node))
(t (t
(org-roam-capture--new-file))))) (org-roam-capture--new-file)))))
(org-capture-put :template (org-capture-put :template
@ -367,16 +369,18 @@ properties to be added to the template."
(list :org-roam org-roam-plist)))) (list :org-roam org-roam-plist))))
;;;###autoload ;;;###autoload
(cl-defun org-roam-capture- (&key goto keys info props templates) (cl-defun org-roam-capture- (&key goto keys node info props templates)
"Main entry point. "Main entry point.
GOTO and KEYS correspond to `org-capture' arguments. GOTO and KEYS correspond to `org-capture' arguments.
INFO is an alist for filling up Org-roam's capture templates. INFO is an alist for filling up Org-roam's capture templates.
NODE is an `org-roam-node' construct containing information about the node.
PROPS is a plist containing additional Org-roam properties for each template. PROPS is a plist containing additional Org-roam properties for each template.
TEMPLATES is a list of org-roam templates." TEMPLATES is a list of org-roam templates."
(let* ((org-capture-templates (let* ((org-capture-templates
(mapcar (lambda (t) (mapcar (lambda (t)
(org-roam-capture--convert-template t props)) (org-roam-capture--convert-template t props))
(or templates org-roam-capture-templates))) (or templates org-roam-capture-templates)))
(org-roam-capture--node node)
(org-roam-capture--info info)) (org-roam-capture--info info))
(when (and (not keys) (when (and (not keys)
(= (length org-capture-templates) 1)) (= (length org-capture-templates) 1))
@ -392,7 +396,7 @@ Arguments GOTO and KEYS see `org-capture'."
(let ((node (org-roam-node-read))) (let ((node (org-roam-node-read)))
(org-roam-capture- :goto goto (org-roam-capture- :goto goto
:keys keys :keys keys
:info (list :node node) :node node
:props '(:immediate-finish nil)))) :props '(:immediate-finish nil))))
(provide 'org-roam-capture) (provide 'org-roam-capture)

4
org-roam.el
View File

@ -692,7 +692,7 @@ If OTHER-WINDOW, visit the NODE in another window."
(if (org-roam-node-file node) (if (org-roam-node-file node)
(org-roam-node-visit node other-window) (org-roam-node-visit node other-window)
(org-roam-capture- (org-roam-capture-
:info (list :node node) :node node
:props '(:finalize find-file))))) :props '(:finalize find-file)))))
(defun org-roam-node-insert (&optional filter-fn) (defun org-roam-node-insert (&optional filter-fn)
@ -724,7 +724,7 @@ which takes as its argument an alist of path-completions."
(concat "id:" (org-roam-node-id node)) (concat "id:" (org-roam-node-id node))
description))) description)))
(org-roam-capture- (org-roam-capture-
:info (list :node node) :node node
:props (list :region (when (and beg end) :props (list :region (when (and beg end)
(cons beg end)) (cons beg end))
:insert-at (point-marker) :insert-at (point-marker)