Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expand relative paths in href and src attributes via replace-match in sanitize-html function. #46

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Expand relative paths in href and src attributes via replace-match in sanitize-html function. #46

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6a18c8
Add: org-web-tools-expand-relative-path.
c1-g Nov 24, 2021
d60109f
Add: Expanding function in org-web-tools--sanitize-html.
c1-g Nov 24, 2021
24be38d
Add: Documentation for org-web-tools-expand-relative-path.
c1-g Nov 24, 2021
acc05c8
Change: org-web-tools--sanitize-html also optionally takes URL.
c1-g Nov 24, 2021
2269fe9
Change: Expand relative path function will replace match literally.
c1-g Nov 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions org-web-tools.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@
:group 'org
:link '(url-link "http://github.com/alphapapa/org-web-tools"))

(defcustom org-web-tools-expand-relative-path t
"Whether or not to expand the relative path in `org-web-tools--sanitize-html'."
:group 'org-web-tools
:type 'boolean)

;;;; Pandoc support

(defconst org-web-tools--pandoc-no-wrap-option nil
Expand Down Expand Up @@ -397,7 +402,7 @@ first-level entry for writing comments."
;; "%(org-web-tools--url-as-readable-org)")
(-let* ((url (or url (org-web-tools--get-first-url)))
(html (org-web-tools--get-url url))
(html (org-web-tools--sanitize-html html))
(html (org-web-tools--sanitize-html html url))
((title . readable) (org-web-tools--eww-readable html))
(title (org-web-tools--cleanup-title (or title "")))
(converted (org-web-tools--html-to-org-with-pandoc readable))
Expand All @@ -417,19 +422,31 @@ first-level entry for writing comments."
"** Article" "\n\n")
(buffer-string))))

(defun org-web-tools--sanitize-html (html)
(defun org-web-tools--sanitize-html (html &optional url)
"Sanitize HTML string."
;; libxml-parse-html-region converts " " to " ", so we have to
;; clean the HTML first.
(setq url (or url (org-web-tools--get-first-url) ""))
(with-temp-buffer
(insert html)
;; `libxml-parse-html-region' converts " " to " ", so we have to
;; clean the HTML first.
(cl-loop for (match . replace) in (list (cons " " " "))
do (progn
(goto-char (point-min))
(while (re-search-forward match nil t)
(replace-match replace))))
(buffer-string)))

;; Expand relative paths
(when org-web-tools-expand-relative-path
(goto-char (point-min))
(while (re-search-forward (rx
(or "href" "src") "="
(? (or "\"" "'"))
(group (+ (not (or ">" "\"" "'")))))
nil t)
(replace-match (save-match-data (url-expand-file-name (match-string 1) url))
nil t nil 1)))

(buffer-string)))
;;;;; Misc

(defun org-web-tools--cleanup-title (title)
Expand Down