yogsototh/org-roam
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(fix): fix org-roam--list-files elisp fallback (#764)

Browse source 
Always fallback to the elisp implementation, when the shell commands
return garbage (possibly from shell configurations).
This commit is contained in:
Jethro Kuan 2020-06-06 19:27:15 +08:00 committed by GitHub
parent 1756ec6441
commit 81e7a5b231
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
org-roam.el
View file

@ -316,7 +316,11 @@ If FILE is not specified, use the current buffer's file-path."
(defun org-roam--shell-command-files (cmd)
"Run CMD in the shell and return a list of files. If no files are found, an empty list is returned."
(seq-filter #'s-present? (split-string (shell-command-to-string cmd) "\n")))
(--> cmd
(shell-command-to-string it)
(ansi-color-filter-apply it)
(split-string it "\n")
(seq-filter #'s-present? it)))
(defun org-roam--list-files-search-globs (exts)
"Given EXTS, return a list of search globs.
@ -424,15 +428,14 @@ Use external shell commands if defined in `org-roam-list-files-commands'."
`((consp symbolp)
,wrong-type))))
(when path (cl-return)))
(let* ((files (if path
(let ((fn (intern (concat "org-roam--list-files-" exe))))
(unless (fboundp fn) (user-error "%s is not an implemented search method" fn))
(funcall fn path (format "\"%s\"" dir)))
(org-roam--list-files-elisp dir)))
(files (mapcar #'ansi-color-filter-apply files)) ; strip ansi codes
(files (seq-filter #'org-roam--org-roam-file-p files))
(files (mapcar #'expand-file-name files))) ; canonicalize names
files)))
(if-let* ((files (when path
(let ((fn (intern (concat "org-roam--list-files-" exe))))
(unless (fboundp fn) (user-error "%s is not an implemented search method" fn))
(funcall fn path (format "\"%s\"" dir)))))
(files (seq-filter #'org-roam--org-roam-file-p files))
(files (mapcar #'expand-file-name files))) ; canonicalize names
files
(org-roam--list-files-elisp dir))))
(defun org-roam--list-all-files ()
"Return a list of all Org-roam files within `org-roam-directory'."