Merge pull request #44 from ScotGovAnalysis/decode-url

Decode file names downloaded by `download_file()`

Author: alice-hannah

NEWS.md

@@ -1,5 +1,8 @@
 # objr (development version)
 
+* `download_file()` now writes files with percent-decoded names 
+(e.g. `file%20name.csv` is now `file name.csv`) (#34).
+
 * Fixed an issue where temporary files sometimes persisted after running 
 `download_file()` or `read_file()` (#39).
 

R/utils_download-upload.R

@@ -201,10 +201,12 @@ file_name_from_header <- function(response,
 
   cont_disp <- httr2::resp_header(response, "Content-Disposition")
 
-  file_name <- regmatches(
-    cont_disp,
-    m = regexpr("(?<=filename=\\\").*(?=\\\")", cont_disp, perl = TRUE)
-  )
+  file_name <-
+    regmatches(
+      cont_disp,
+      m = regexpr("(?<=filename=\\\").*(?=\\\")", cont_disp, perl = TRUE)
+    ) %>%
+    utils::URLdecode()
 
   if (length(file_name) == 0) {
     cli::cli_abort(

README.md

@@ -8,7 +8,7 @@
 
 <!-- badges: end -->
 
-objr aims to provide a convenient method of interacting with [Objective Connect](https://secure.objectiveconnect.co.uk) using R, making use of the [Objective Connect API](https://secure.objectiveconnect.co.uk/publicapi/1/swagger-ui/index.html).
+objr (pronounced "ob-jar") aims to provide a convenient method of interacting with [Objective Connect](https://secure.objectiveconnect.co.uk) using R, making use of the [Objective Connect API](https://secure.objectiveconnect.co.uk/publicapi/1/swagger-ui/index.html).
 
 ## Installation
 

tests/testthat/test-utils_download-upload.R

@@ -252,9 +252,11 @@ test_that("Correct value returned", {
   expect_equal(
     file_name_from_header(
       httr2::response(
-        headers = list(`Content-Disposition` = "filename=\"new_name.csv\"")
+        headers = list(
+          `Content-Disposition` = "filename=\"ayrshire%20%26%20arran.csv\""
+        )
       )
     ),
-    "new_name.csv"
+    "ayrshire & arran.csv"
   )
 })