replace URLdecode() with url_unescape() etc.

HenningLorenzen-ext-bayer · Jul 12, 2024 · cb57136 · cb57136
1 parent ea73a3c
commit cb57136
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/R/check-built.R b/R/check-built.R
@@ -14,9 +14,7 @@ check_missing_images <- function(pkg, src_path, dst_path) {
   img <- xml2::xml_find_all(html, ".//img")
   src <- xml2::xml_attr(img, "src")
 
-  rel_src <-
-    purrr::map_chr(.x = src[xml2::url_parse(src)$scheme == ""],
-                   .f = utils::URLdecode)
+  rel_src <- xml2::url_unescape(src[xml2::url_parse(src)$scheme == ""])
   rel_path <- path_norm(path(path_dir(dst_path), rel_src))
   exists <- file_exists(path(pkg$dst_path, rel_path))
 

diff --git a/R/tweak-page.R b/R/tweak-page.R
@@ -48,16 +48,10 @@ tweak_rmarkdown_html <- function(html, input_path, pkg = list(bs_version = 3)) {
   abs_src <- is_absolute_path(src)
   if (any(abs_src)) {
     img_target_nodes <- img[abs_src]
-
-    img_src_real <-
-      purrr::map_chr(.x = src[abs_src], .f = utils::URLdecode)
-    img_src_real <- path_real(img_src_real)
-
-    input_path_real <- path_real(utils::URLdecode(input_path))
-
+    img_src_real <- path_real(xml2::url_unescape(src[abs_src]))
+    input_path_real <- path_real(xml2::url_unescape(input_path))
     img_rel_paths <- path_rel(path = img_src_real, start = input_path_real)
-    img_rel_paths <-
-      purrr::map_chr(.x = img_rel_paths, .f = utils::URLencode)
+    img_rel_paths <- xml2::url_escape(img_rel_paths)
 
     purrr::walk2(
       .x = img_target_nodes,