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): remove org-roam--get-title-or-slug function (#1284)

Browse Source 
Every file has a title when saved into the database, so this function is
redundant in most cases (e.g. in org-roam-buffer, where backlinks are
fetched from the database).
This commit is contained in:
Jethro Kuan
2020-11-15 19:44:36 +08:00
committed by GitHub
parent baf0dd9d00
commit face683e00
5 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/org-roam.org
View File

@ -1471,8 +1471,8 @@ using [[https://github.com/raxod502/el-patch][el-patch]]:
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package el-patch (use-package el-patch
:straight (:host github :straight (:host github
:repo "raxod502/el-patch" :repo "raxod502/el-patch"
:branch "develop")) :branch "develop"))
(eval-when-compile (eval-when-compile
(require 'el-patch)) (require 'el-patch))
@ -1491,7 +1491,7 @@ using [[https://github.com/raxod502/el-patch][el-patch]]:
(if begin (if begin
(funcall deft-parse-title-function (funcall deft-parse-title-function
(substring contents begin (match-end 0)))))) (substring contents begin (match-end 0))))))
(org-roam--get-title-or-slug file)))) (org-roam-db--get-title file))))
#+END_SRC #+END_SRC
The Deft interface can slow down quickly when the number of files get huge. The Deft interface can slow down quickly when the number of files get huge.

6
doc/org-roam.texi
View File

@ -1976,8 +1976,8 @@ using @uref{https://github.com/raxod502/el-patch, el-patch}:
@lisp @lisp
(use-package el-patch (use-package el-patch
:straight (:host github :straight (:host github
:repo "raxod502/el-patch" :repo "raxod502/el-patch"
:branch "develop")) :branch "develop"))
(eval-when-compile (eval-when-compile
(require 'el-patch)) (require 'el-patch))
@ -1996,7 +1996,7 @@ used as title."
(if begin (if begin
(funcall deft-parse-title-function (funcall deft-parse-title-function
(substring contents begin (match-end 0)))))) (substring contents begin (match-end 0))))))
(org-roam--get-title-or-slug file)))) (org-roam-db--get-title file))))
@end lisp @end lisp
The Deft interface can slow down quickly when the number of files get huge. The Deft interface can slow down quickly when the number of files get huge.

8
org-roam-buffer.el
View File

@ -47,9 +47,9 @@
(defvar org-roam--org-link-bracket-typed-re) (defvar org-roam--org-link-bracket-typed-re)
(declare-function org-roam-db--ensure-built "org-roam-db") (declare-function org-roam-db--ensure-built "org-roam-db")
(declare-function org-roam-db--get-title "org-roam-db")
(declare-function org-roam--extract-refs "org-roam") (declare-function org-roam--extract-refs "org-roam")
(declare-function org-roam--extract-titles "org-roam") (declare-function org-roam--extract-titles "org-roam")
(declare-function org-roam--get-title-or-slug "org-roam")
(declare-function org-roam--get-backlinks "org-roam") (declare-function org-roam--get-backlinks "org-roam")
(declare-function org-roam-backlinks-mode "org-roam") (declare-function org-roam-backlinks-mode "org-roam")
(declare-function org-roam-mode "org-roam") (declare-function org-roam-mode "org-roam")
@ -116,7 +116,7 @@ For example: (setq org-roam-buffer-window-parameters '((no-other-window . t)))"
(defun org-roam-buffer--insert-title () (defun org-roam-buffer--insert-title ()
"Insert the org-roam-buffer title." "Insert the org-roam-buffer title."
(insert (propertize (org-roam--get-title-or-slug (insert (propertize (org-roam-db--get-title
(buffer-file-name org-roam-buffer--current)) (buffer-file-name org-roam-buffer--current))
'font-lock-face 'font-lock-face
'org-document-title))) 'org-document-title)))
@ -164,7 +164,7 @@ ORIG-PATH is the path where the CONTENT originated."
(bls (cdr group))) (bls (cdr group)))
(insert (format "** %s\n" (insert (format "** %s\n"
(org-roam-format-link file-from (org-roam-format-link file-from
(org-roam--get-title-or-slug file-from) (org-roam-db--get-title file-from)
"file"))) "file")))
(dolist (backlink bls) (dolist (backlink bls)
(pcase-let ((`(,file-from _ ,props) backlink)) (pcase-let ((`(,file-from _ ,props) backlink))
@ -195,7 +195,7 @@ ORIG-PATH is the path where the CONTENT originated."
(setq props (seq-sort-by (lambda (p) (plist-get p :point)) #'< props)) (setq props (seq-sort-by (lambda (p) (plist-get p :point)) #'< props))
(insert (format "** %s\n" (insert (format "** %s\n"
(org-roam-format-link file-from (org-roam-format-link file-from
(org-roam--get-title-or-slug file-from) (org-roam-db--get-title file-from)
"file"))) "file")))
(dolist (prop props) (dolist (prop props)
(insert "*** " (insert "*** "

4
org-roam-db.el
View File

@ -403,8 +403,8 @@ Return the number of rows inserted."
(puthash (car row) (cadr row) ht)) (puthash (car row) (cadr row) ht))
ht)) ht))
(defun org-roam-db--get-titles (file) (defun org-roam-db--get-title (file)
"Return the titles of FILE from the cache." "Return the main title of FILE from the cache."
(caar (org-roam-db-query [:select [title] :from titles (caar (org-roam-db-query [:select [title] :from titles
:where (= file $s1) :where (= file $s1)
:limit 1] :limit 1]

11
org-roam.el
View File

@ -796,11 +796,6 @@ Each ref is returned as a cons of its type and its key."
(file-relative-name (expand-file-name org-roam-directory)) (file-relative-name (expand-file-name org-roam-directory))
(file-name-sans-extension))) (file-name-sans-extension)))
(defun org-roam--get-title-or-slug (path)
"Convert `PATH' to the file title, if it exists. Else, return the path."
(or (org-roam-db--get-titles path)
(org-roam--path-to-slug path)))
(defun org-roam--title-to-slug (title) (defun org-roam--title-to-slug (title)
"Convert TITLE to a filename-suitable slug." "Convert TITLE to a filename-suitable slug."
(cl-flet* ((nonspacing-mark-p (char) (cl-flet* ((nonspacing-mark-p (char)
@ -1772,7 +1767,7 @@ Return added tag."
(interactive) (interactive)
(let* ((roam-buffers (org-roam--get-roam-buffers)) (let* ((roam-buffers (org-roam--get-roam-buffers))
(names-and-buffers (mapcar (lambda (buffer) (names-and-buffers (mapcar (lambda (buffer)
(cons (or (org-roam--get-title-or-slug (cons (or (org-roam-db--get-title
(buffer-file-name buffer)) (buffer-file-name buffer))
(buffer-name buffer)) (buffer-name buffer))
buffer)) buffer))
@ -1855,7 +1850,8 @@ the executable 'rg' in variable `exec-path'."
(let ((rowcol (concat row ":" col))) (let ((rowcol (concat row ":" col)))
(insert "- " (insert "- "
(org-link-make-string (concat "file:" file "::" rowcol) (org-link-make-string (concat "file:" file "::" rowcol)
(format "[%s] %s" rowcol (org-roam--get-title-or-slug file)))) (format "[%s] %s" rowcol (or (org-roam-db--get-title file)
file))))
(when (executable-find "sed") ; insert line contents when sed is available (when (executable-find "sed") ; insert line contents when sed is available
(insert " :: " (insert " :: "
(shell-command-to-string (shell-command-to-string
@ -1871,7 +1867,6 @@ the executable 'rg' in variable `exec-path'."
(highlight-phrase (downcase title) 'bold-italic)) (highlight-phrase (downcase title) 'bold-italic))
(goto-char (point-min)))))) (goto-char (point-min))))))
;;;###autoload ;;;###autoload
(defun org-roam-version (&optional message) (defun org-roam-version (&optional message)
"Return `org-roam' version. "Return `org-roam' version.