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

(internal): replace find-file-noselect with with-temp-buffer where possible (#1150)

Browse Source 
`find-file-noselect` is affected by the user's init.el, and there is
little control over what is being activated. For database updates, read
access is all we need, so we use `with-temp-file`.
This commit is contained in:
Jethro Kuan
2020-09-29 12:42:23 +08:00
committed by GitHub
parent 64d8ba1900
commit be64f107e9
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
org-roam-db.el
View File

@ -393,7 +393,7 @@ connections, nil is returned."
;;;;; Updating ;;;;; Updating
(defun org-roam-db--update-meta () (defun org-roam-db--update-meta ()
"Update the metadata of the current buffer into the cache." "Update the metadata of the current buffer into the cache."
(let* ((file (buffer-file-name)) (let* ((file (or org-roam-file-name (buffer-file-name)))
(attr (file-attributes file)) (attr (file-attributes file))
(atime (file-attribute-access-time attr)) (atime (file-attribute-access-time attr))
(mtime (file-attribute-modification-time attr)) (mtime (file-attribute-modification-time attr))
@ -405,7 +405,7 @@ connections, nil is returned."
(defun org-roam-db--update-titles () (defun org-roam-db--update-titles ()
"Update the title of the current buffer into the cache." "Update the title of the current buffer into the cache."
(let* ((file (buffer-file-name)) (let* ((file (or org-roam-file-name (buffer-file-name)))
(titles (or (org-roam--extract-titles) (titles (or (org-roam--extract-titles)
(list (org-roam--path-to-slug file))))) (list (org-roam--path-to-slug file)))))
(org-roam-db-query [:delete :from titles (org-roam-db-query [:delete :from titles
@ -415,8 +415,8 @@ connections, nil is returned."
(defun org-roam-db--update-tags () (defun org-roam-db--update-tags ()
"Update the tags of the current buffer into the cache." "Update the tags of the current buffer into the cache."
(let ((file (buffer-file-name)) (let* ((file (or org-roam-file-name (buffer-file-name)))
(tags (org-roam--extract-tags))) (tags (org-roam--extract-tags file)))
(org-roam-db-query [:delete :from tags (org-roam-db-query [:delete :from tags
:where (= file $s1)] :where (= file $s1)]
file) file)
@ -425,7 +425,7 @@ connections, nil is returned."
(defun org-roam-db--update-refs () (defun org-roam-db--update-refs ()
"Update the ref of the current buffer into the cache." "Update the ref of the current buffer into the cache."
(let ((file (buffer-file-name))) (let ((file (or org-roam-file-name (buffer-file-name))))
(org-roam-db-query [:delete :from refs (org-roam-db-query [:delete :from refs
:where (= file $s1)] :where (= file $s1)]
file) file)
@ -434,7 +434,7 @@ connections, nil is returned."
(defun org-roam-db--update-links () (defun org-roam-db--update-links ()
"Update the file links of the current buffer in the cache." "Update the file links of the current buffer in the cache."
(let ((file (buffer-file-name))) (let ((file (or org-roam-file-name (buffer-file-name))))
(org-roam-db-query [:delete :from links (org-roam-db-query [:delete :from links
:where (= from $s1)] :where (= from $s1)]
file) file)
@ -443,7 +443,7 @@ connections, nil is returned."
(defun org-roam-db--update-headlines () (defun org-roam-db--update-headlines ()
"Update the file headlines of the current buffer into the cache." "Update the file headlines of the current buffer into the cache."
(let* ((file (buffer-file-name))) (let* ((file (or org-roam-file-name (buffer-file-name))))
(org-roam-db-query [:delete :from headlines (org-roam-db-query [:delete :from headlines
:where (= file $s1)] :where (= file $s1)]
file) file)
@ -459,16 +459,15 @@ If the file exists, update the cache with information."
(cond ((not (file-exists-p file-path)) (cond ((not (file-exists-p file-path))
(org-roam-db--clear-file file-path)) (org-roam-db--clear-file file-path))
((org-roam--org-roam-file-p file-path) ((org-roam--org-roam-file-p file-path)
(with-current-buffer (find-file-noselect file-path t) (org-roam--with-temp-buffer file-path
(org-with-wide-buffer (emacsql-with-transaction (org-roam-db)
(emacsql-with-transaction (org-roam-db)
(org-roam-db--update-meta) (org-roam-db--update-meta)
(org-roam-db--update-tags) (org-roam-db--update-tags)
(org-roam-db--update-titles) (org-roam-db--update-titles)
(org-roam-db--update-refs) (org-roam-db--update-refs)
(when org-roam-enable-headline-linking (when org-roam-enable-headline-linking
(org-roam-db--update-headlines)) (org-roam-db--update-headlines))
(org-roam-db--update-links))))))) (org-roam-db--update-links))))))
(defun org-roam-db-build-cache (&optional force) (defun org-roam-db-build-cache (&optional force)
"Build the cache for `org-roam-directory'. "Build the cache for `org-roam-directory'.

5
org-roam.el
View File

@ -604,8 +604,9 @@ FILE-FROM is typically the buffer file path, but this may not exist, for example
in temp buffers. In cases where this occurs, we do know the file path, and pass in temp buffers. In cases where this occurs, we do know the file path, and pass
it as FILE-PATH." it as FILE-PATH."
(require 'org-ref nil t) (require 'org-ref nil t)
(unless file-path (setq file-path (or file-path
(setq file-path (buffer-file-name))) org-roam-file-name
(buffer-file-name)))
(save-excursion (save-excursion
(let (links) (let (links)
(org-element-map (org-element-parse-buffer) 'link (org-element-map (org-element-parse-buffer) 'link