emacs/protesilaos.denote
1
0
Fork 0
mirror of https://github.com/protesilaos/denote.git synced 2026-09-10 07:16:20 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor denote-sort-dired and remove the helper function

Browse source 
This function is extremely slow because calling (dired (cons directory
files)) triggers ls for every file. When there are a large number of
files, The `call-process' becomes expensive. There is no other way to
change this behavior in dired. We should use Emacs’s built-in ls
implementation (ls-lisp). On my machine, with around 200 files, this
reduces execution time by about 6x.

Additionally, prepare-buffer seems unnecessary. It is a private
function (indicated by the double dash) and is not intended for user
access or other use cases. It calls files-fn twice, which is redundant.
We should instead set the revert-function directly in a single function
to make its purpose explicit.

* (denote-sort-dired): refactor
* (denote-sort-dired--prepare-buffer): remove
This commit is contained in:
duli 2026-01-14 16:35:23 +08:00
parent 47207e9cb2
commit b92f185818
No known key found for this signature in database
GPG key ID: 0C378F00219F31FD
1 changed files with 23 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
denote.el
View file

@ -1938,30 +1938,6 @@ If REVERSE is nil, use the value of the user option
"\n"
(propertize "No more matching files" 'face 'warning))))
(defun denote-sort-dired--prepare-buffer (directory files-fn buffer-name)
"Prepare buffer for `denote-sort-dired'.
DIRECTORY is an absolute path to the `default-directory' of the Dired
listing.
FILES-FN is a function that returns the files to be listed in the Dired
buffer.
BUFFER-NAME is the name of the resulting buffer."
(let* ((default-directory directory)
(files (funcall files-fn))
(dired-buffer (dired (cons directory files))))
(with-current-buffer dired-buffer
(rename-buffer buffer-name :unique)
(setq-local revert-buffer-function
(lambda (&rest _)
(if-let* ((default-directory directory)
(files (funcall files-fn)))
(progn
(setq-local dired-directory (cons directory files))
(dired-revert))
(denote-dired-empty-mode)))))
buffer-name))
;;;###autoload
(defun denote-sort-dired (files-matching-regexp sort-by-component reverse exclude-regexp)
"Produce Dired buffer with sorted files from variable `denote-directory'.
@ -1991,20 +1967,30 @@ When called from Lisp, the arguments are a string, a symbol among
`denote-sort-components', a non-nil value, and a string, respectively."
(interactive (append (list (denote-files-matching-regexp-prompt)) (denote-sort-dired--prompts)))
(pcase-let* ((`(,component . ,reverse-sort) (denote-sort-dired--get-sort-parameters sort-by-component reverse))
(roots (denote-directories))
(single-dir-p (null (cdr roots)))
(files-fn `(lambda ()
(let ((files (denote-sort-get-directory-files ,files-matching-regexp ',component ,reverse-sort nil ,exclude-regexp)))
(if ,single-dir-p
(mapcar #'file-relative-name files)
files)))))
(if-let* ((directory (if single-dir-p ; see comment in `denote-file-prompt'
(car roots)
(denote-directories-get-common-root)))
(files (funcall files-fn))
(buffer-name (funcall denote-sort-dired-buffer-name-function files-matching-regexp sort-by-component reverse-sort exclude-regexp)))
(denote-sort-dired--prepare-buffer directory files-fn buffer-name)
(message "No matching files for: %s" files-matching-regexp))))
(let ((files (denote-sort-get-directory-files ,files-matching-regexp ',component ,reverse-sort nil ,exclude-regexp))
(partial-relative-fn ,(let ((directory (denote-directories-get-common-root)))
(lambda (file)
(when (string-prefix-p directory file)
(substring file (length directory)))))))
(mapcar partial-relative-fn files)))))
(dlet ((ls-lisp-use-insert-directory-program (progn (require 'ls-lisp) nil)))
(if-let* ((directory (and (not (null (denote-directories)))
(denote-directories-get-common-root)))
(files (funcall files-fn))
(buffer-name (funcall denote-sort-dired-buffer-name-function files-matching-regexp sort-by-component reverse-sort exclude-regexp))
(dired-buffer (dired (cons directory files))))
(with-current-buffer dired-buffer
(rename-buffer buffer-name :unique)
(setq-local revert-buffer-function
(lambda (&rest _)
(dlet ((ls-lisp-use-insert-directory-program (progn (require 'ls-lisp) nil)))
(if-let* ((files (funcall files-fn)))
(progn
(setq-local dired-directory (cons directory files))
(dired-revert))
(denote-dired-empty-mode))))))
(message "No matching files for: %s" files-matching-regexp)))))
(defalias 'denote-dired 'denote-sort-dired
"Alias for `denote-sort-dired' command.")