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

(fix): allow title changes that don't modify filename (#1189)

Browse Source 
Prevent error when trying to move file to same name

Prevent string matching in org from messing with the current re-search-forward
position which has caused infinite broken search
This commit is contained in:
Herbert Jones
2020-10-15 13:19:15 -05:00
committed by GitHub
parent cbf1b585ac
commit a0c4abf579
1 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
org-roam.el
View File

@ -1296,6 +1296,25 @@ during the next idle slot."
(org-roam--org-roam-file-p file)) (org-roam--org-roam-file-p file))
(org-roam-db--clear-file (expand-file-name file)))) (org-roam-db--clear-file (expand-file-name file))))
(defun org-roam--get-link-replacement (old-path new-path old-desc new-desc)
"Create replacement text for link at point if OLD-PATH is a match.
Will update link to NEW-PATH. If OLD-DESC is set, and is not the
same as the link description, it is assumed that the user has
modified the description, and the description will not be
updated. Else, update with NEW-DESC."
(when-let ((link (org-element-lineage (org-element-context) '(link) t)))
(let ((type (org-element-property :type link))
(path (org-element-property :path link)))
(when (and (string-equal (expand-file-name path) old-path)
(org-in-regexp org-link-bracket-re 1))
(let* ((label (if (match-end 2)
(match-string-no-properties 2)
(org-link-unescape (match-string-no-properties 1))))
(new-label (if (string-equal label old-desc)
new-desc
label)))
(org-roam-format-link new-path new-label type))))))
(defun org-roam--replace-link (old-path new-path &optional old-desc new-desc) (defun org-roam--replace-link (old-path new-path &optional old-desc new-desc)
"Replace Org-roam file links with path OLD-PATH to path NEW-PATH. "Replace Org-roam file links with path OLD-PATH to path NEW-PATH.
If OLD-DESC is passed, and is not the same as the link If OLD-DESC is passed, and is not the same as the link
@ -1305,18 +1324,23 @@ update with NEW-DESC."
(save-excursion (save-excursion
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward org-link-any-re nil t) (while (re-search-forward org-link-any-re nil t)
(when-let ((link (org-element-lineage (org-element-context) '(link) t))) (when-let ((new-link (save-match-data
(let ((type (org-element-property :type link)) (org-roam--get-link-replacement
(path (org-element-property :path link))) old-path new-path old-desc new-desc))))
(when (and (string-equal (expand-file-name path) old-path) (replace-match new-link)))))
(org-in-regexp org-link-bracket-re 1))
(let* ((label (if (match-end 2) (defun org-roam--get-relative-link-replacement (old-path)
(match-string-no-properties 2) "Create file-relative link for link at point if needed.
(org-link-unescape (match-string-no-properties 1)))) File relative links are assumed to originate from OLD-PATH. The
(new-label (if (string-equal label old-desc) replaced links are made relative to the current buffer."
new-desc (when-let ((link (org-element-lineage (org-element-context) '(link) t)))
label))) (let ((type (org-element-property :type link))
(replace-match (org-roam-format-link new-path new-label type))))))))) (path (org-element-property :path link)))
(when (and (f-relative-p path)
(org-in-regexp org-link-bracket-re 1))
(let* ((file-path (expand-file-name path (file-name-directory old-path)))
(new-path (org-roam-link-get-path file-path)))
(concat type ":" new-path))))))
(defun org-roam--fix-relative-links (old-path) (defun org-roam--fix-relative-links (old-path)
"Fix file-relative links in current buffer. "Fix file-relative links in current buffer.
@ -1325,15 +1349,9 @@ replaced links are made relative to the current buffer."
(save-excursion (save-excursion
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward org-link-any-re nil t) (while (re-search-forward org-link-any-re nil t)
(when-let ((link (org-element-lineage (org-element-context) '(link) t))) (when-let ((new-link (save-match-data
(let ((type (org-element-property :type link)) (org-roam--get-relative-link-replacement old-path))))
(path (org-element-property :path link))) (replace-match new-link nil t nil 1)))))
(when (and (f-relative-p path)
(org-in-regexp org-link-bracket-re 1))
(let* ((file-path (expand-file-name path (file-name-directory old-path)))
(new-path (org-roam-link-get-path file-path)))
(replace-match (concat type ":" new-path)
nil t nil 1))))))))
(defcustom org-roam-rename-file-on-title-change t (defcustom org-roam-rename-file-on-title-change t
"If non-nil, alter the filename on title change. "If non-nil, alter the filename on title change.
@ -1401,10 +1419,11 @@ To be added to `org-roam-title-change-hook'."
(when (string-match-p old-slug file-name) (when (string-match-p old-slug file-name)
(let* ((new-slug (funcall org-roam-title-to-slug-function new-title)) (let* ((new-slug (funcall org-roam-title-to-slug-function new-title))
(new-file-name (replace-regexp-in-string old-slug new-slug file-name))) (new-file-name (replace-regexp-in-string old-slug new-slug file-name)))
(rename-file file-name new-file-name) (unless (string-match-p file-name new-file-name)
(set-visited-file-name new-file-name t t) (rename-file file-name new-file-name)
(add-to-list 'org-roam--file-update-queue new-file-name) (set-visited-file-name new-file-name t t)
(org-roam-message "File moved to %S" (abbreviate-file-name new-file-name))))))) (add-to-list 'org-roam--file-update-queue new-file-name)
(org-roam-message "File moved to %S" (abbreviate-file-name new-file-name))))))))
(defun org-roam--rename-file-advice (old-file new-file-or-dir &rest _args) (defun org-roam--rename-file-advice (old-file new-file-or-dir &rest _args)
"Rename backlinks of OLD-FILE to refer to NEW-FILE-OR-DIR. "Rename backlinks of OLD-FILE to refer to NEW-FILE-OR-DIR.