Add exif argument

CITATION.cff

@@ -58,9 +58,6 @@ references:
     email: jeroen@berkeley.edu
     orcid: https://orcid.org/0000-0002-4035-0289
   year: '2024'
-  identifiers:
-  - type: url
-    value: https://curl.se/libcurl/
 - type: software
   title: httr
   abstract: 'httr: Tools for Working with URLs and HTTP'

R/resmush_file.R

@@ -18,7 +18,9 @@
 #' @param qlty Only affects `jpg` files. Integer between 0 and 100 indicating
 #' the optimization level. For optimal results use vales above 90.
 #' @param verbose Logical. If `TRUE` displays a summary of the results.
-#'
+#' @param exif_preserve Logical. Should be the
+#'   [Exif](https://en.wikipedia.org/wiki/Exif) information removed as well?
+#'   Default is to remove (i.e. `exif_preserve = FALSE`).
 #' @return
 #' Writes on disk the optimized file if the API call is successful.
 #' In any case, a (invisibly) data frame with a summary of the process is
@@ -52,7 +54,8 @@
 #' resmush_file(jpg_file, outfile = tmp_jpg, verbose = TRUE)
 #' resmush_file(jpg_file, outfile = tmp_jpg, verbose = TRUE, qlty = 10)
 #' }
-resmush_file <- function(file, outfile = file, qlty = 92, verbose = FALSE) {
+resmush_file <- function(file, outfile = file, qlty = 92, verbose = FALSE,
+                         exif_preserve = FALSE) {
   # Master table with results
   res <- data.frame(
     src_img = file, dest_img = NA, src_size = NA,
@@ -89,8 +92,14 @@ resmush_file <- function(file, outfile = file, qlty = 92, verbose = FALSE) {
   file_post$name <- basename(file)
 
   # Send to reSmusht
+  # Make logical
+  exif_preserve <- isTRUE(exif_preserve)
+
   api_post <- httr::POST(
-    paste0("http://api.resmush.it/?qlty=", qlty),
+    paste0(
+      "http://api.resmush.it/?qlty=", qlty,
+      "&exif=", exif_preserve
+    ),
     body = list(files = file_post)
   )
 

R/resmush_url.R

@@ -49,7 +49,7 @@
 #' resmush_url(jpg_url, verbose = TRUE, qlty = 10)
 #' }
 resmush_url <- function(url, outfile = file.path(tempdir(), basename(url)),
-                        qlty = 92, verbose = FALSE) {
+                        qlty = 92, verbose = FALSE, exif_preserve = FALSE) {
   # Master table with results
   res <- data.frame(
     src_img = url, dest_img = NA, src_size = NA,
@@ -67,7 +67,7 @@ resmush_url <- function(url, outfile = file.path(tempdir(), basename(url)),
 
   # API Calls -----
 
-  res_get <- smush_from_url(url, qlty, n_rep = 3)
+  res_get <- smush_from_url(url, qlty, exif_preserve, n_rep = 3)
 
   if ("error" %in% names(res_get)) {
     cli::cli_alert_warning("API Error for {.href {url}}")
@@ -139,12 +139,16 @@ resmush_url <- function(url, outfile = file.path(tempdir(), basename(url)),
 
 # Helper function for retrying the call
 # Useful for some cases e.g imgur
-smush_from_url <- function(url, qlty, n_rep = 3) {
+smush_from_url <- function(url, qlty, exif_preserve = TRUE, n_rep = 3) {
+  # Make logical
+  exif_preserve <- isTRUE(exif_preserve)
+
   for (i in seq(1, n_rep)) {
     api_get <- httr::GET(
       paste0(
         "http://api.resmush.it/ws.php?qlty=", qlty,
-        "&img=", url
+        "&img=", url,
+        "&exif=", exif_preserve
       )
     )
 

codemeta.json

@@ -107,7 +107,7 @@
     },
     "SystemRequirements": null
   },
-  "fileSize": "440.846KB",
+  "fileSize": "447.577KB",
   "releaseNotes": "https://github.com/dieghernan/resmush/blob/master/NEWS.md",
   "readme": "https://github.com/dieghernan/resmush/blob/main/README.md",
   "contIntegration": ["https://github.com/dieghernan/resmush/actions/workflows/check-full.yaml", "https://app.codecov.io/gh/dieghernan/resmush"],

inst/WORDLIST

@@ -1,5 +1,6 @@
 CMD
 CodeFactor
+Exif
 Flaticon
 Flaticons
 Freepik

tests/testthat/_snaps/remush_url.md

@@ -0,0 +1,75 @@
+# Test offline
+
+    Code
+      dm <- resmush_url(png_url)
+    Message
+      ! Offline
+
+---
+
+    Code
+      dm
+    Output
+                                                                                  src_img
+      1 https://raw.githubusercontent.com/dieghernan/resmush/main/inst/extimg/example.png
+        dest_img src_size dest_size compress_ratio   notes
+      1       NA       NA        NA             NA Offline
+
+# Test corner
+
+    Code
+      dm <- resmush_url(png_url)
+    Message
+      ! API Not responding, check <https://resmush.it/status>
+
+---
+
+    Code
+      dm
+    Output
+                                                                                  src_img
+      1 https://raw.githubusercontent.com/dieghernan/resmush/main/inst/extimg/example.png
+        dest_img src_size dest_size compress_ratio
+      1       NA       NA        NA             NA
+                                                       notes
+      1 API Not responding, check https://resmush.it/status}
+
+# Test not url
+
+    Code
+      dm <- resmush_url(turl)
+    Message
+      ! API Error for <https://dieghernan.github.io/aaabbbccc.png>
+      i Error 401: Cannot copy from remote url
+
+---
+
+    Code
+      dm
+    Output
+                                           src_img dest_img src_size dest_size
+      1 https://dieghernan.github.io/aaabbbccc.png       NA       NA        NA
+        compress_ratio                            notes
+      1             NA 401: Cannot copy from remote url
+
+# Not valid file
+
+    Code
+      dm <- resmush_url(turl)
+    Message
+      ! API Error for <https://raw.githubusercontent.com/dieghernan/resmush/main/README.md>
+      i Error 403: Unauthorized extension. Allowed are : JPG, PNG, GIF, BMP, TIFF,
+        WEBP
+
+---
+
+    Code
+      dm
+    Output
+                                                                    src_img dest_img
+      1 https://raw.githubusercontent.com/dieghernan/resmush/main/README.md       NA
+        src_size dest_size compress_ratio
+      1       NA        NA             NA
+                                                                            notes
+      1 403: Unauthorized extension. Allowed are : JPG, PNG, GIF, BMP, TIFF, WEBP
+