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): fix relative link replacement (#1233)

Browse Source
This commit is contained in:
Jethro Kuan
2020-11-04 15:25:08 +08:00
committed by GitHub
parent bc5c41d212
commit b2cc997976
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -15,6 +15,7 @@
- [#1201](https://github.com/org-roam/org-roam/issues/1201) fix `org-roam-db-build-cache` failing in scenarios involving duplicate IDs and deleted files. - [#1201](https://github.com/org-roam/org-roam/issues/1201) fix `org-roam-db-build-cache` failing in scenarios involving duplicate IDs and deleted files.
- [#1226](https://github.com/org-roam/org-roam/issues/1226) only update relative path of file links - [#1226](https://github.com/org-roam/org-roam/issues/1226) only update relative path of file links
- [#1232](https://github.com/org-roam/org-roam/issues/1232) fix incorrect title extractions from narrowed buffers - [#1232](https://github.com/org-roam/org-roam/issues/1232) fix incorrect title extractions from narrowed buffers
- [#1233](https://github.com/org-roam/org-roam/issues/1233) fixes bug where descriptive file links become plain links during update for relative paths
## 1.2.2 (06-10-2020) ## 1.2.2 (06-10-2020)

31
org-roam.el
View File

@ -1315,30 +1315,21 @@ update with NEW-DESC."
old-path new-path old-desc new-desc)))) old-path new-path old-desc new-desc))))
(replace-match new-link))))) (replace-match new-link)))))
(defun org-roam--get-relative-link-replacement (old-path)
"Create file-relative link for link at point if needed.
File relative links are assumed to originate from OLD-PATH. The
replaced links are made relative to the current buffer."
(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= type "file")
(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.
File relative links are assumed to originate from OLD-PATH. The File relative links are assumed to originate from OLD-PATH. The
replaced links are made relative to the current buffer." replaced links are made relative to the current buffer."
(save-excursion (org-with-point-at 1
(goto-char (point-min)) (let (link new-link type path)
(while (re-search-forward org-link-any-re nil t) (while (re-search-forward org-link-bracket-re nil t)
(when-let ((new-link (save-match-data (when (setq link (save-match-data (org-element-lineage (org-element-context) '(link) t)))
(org-roam--get-relative-link-replacement old-path)))) (setq type (org-element-property :type link))
(replace-match new-link nil t nil 1))))) (setq path (org-element-property :path link))
(when (and (string= type "file")
(f-relative-p path))
(setq new-link
(concat type ":" (org-roam-link-get-path (expand-file-name path (file-name-directory old-path)))))
(replace-match new-link 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.