Merge pull request #4 from eea/develop

Fixes & improvements

Author: mckeea

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: hdar
 Type: Package
 Title: 'REST' API Client for Accessing Data on 'WEkEO HDA V2'
-Version: 1.0.2
+Version: 1.0.4
 URL: https://www.wekeo.eu/
 BugReports: https://github.com/eea/hdar/issues
 Authors@R: person("Matteo", "Mattiuzzi", email = "matteo.mattiuzzi@eea.europa.eu", role = c("aut", "cre"))

R/client.R

@@ -156,7 +156,7 @@ Client <- R6::R6Class("Client",
             class = "card-header", id = paste0("heading", index),
             htmltools::tags$h2(
               class = "mb-0",
-              htmltools::tags$button(feature$title,
+              htmltools::tags$button(feature$term_id,
                 class = "btn btn-link",
                 type = "button",
                 `data-toggle` = "collapse",

R/paginator.R

@@ -9,10 +9,9 @@ Paginator <- R6::R6Class("Paginator",
       results <- list()
       start_index <- 0
 
-      params <- list(
-        "startIndex" = 0,
-        "itemsPerPage" = items_per_page
-      )
+      if (!is.null(limit) && limit < items_per_page) {
+        items_per_page <- limit
+      }
 
       tryCatch(
         {
@@ -26,7 +25,7 @@ Paginator <- R6::R6Class("Paginator",
               }
             }
 
-            if ((!is.null(limit) && length(results) > limit) ||
+            if ((!is.null(limit) && length(results) >= limit) ||
               length(results) >= resp$properties$totalResults || length(results) == 0) {
               break
             }
@@ -47,16 +46,17 @@ Paginator <- R6::R6Class("Paginator",
     client = NULL,
     request_type = NULL,
     get_page = function(request, start_index = 0, items_per_page = 10) {
-      params <- list(
-        "startIndex" = start_index,
-        "itemsPerPage" = items_per_page
-      )
 
       req <- request
       if (private$request_type == "POST") {
         req <- req %>%
-          httr2::req_body_json_modify(params)
+          httr2::req_body_json_modify(startIndex = start_index,
+                                      itemsPerPage = items_per_page)
       } else {
+        params <- list(
+          startIndex = start_index,
+          itemsPerPage = items_per_page
+        )
         req <- req %>%
           httr2::req_url_query(!!!params)
       }

R/search_results.R

@@ -46,10 +46,11 @@ SearchResults <- R6::R6Class("SearchResults",
     #' @param selected_indexes Optional; indices of the specific results to download.
     #' @param stop_at_failure Optional; controls whether the download process of multiple files should immediately stop upon encountering the first failure.
     #' @param force Optional; forces the download even if the file already exists in the specified output directory.
+    #' @param prompt Optional; enables all user prompts for decisions during file downloads. Defaults to true.
     #' @return Nothing returned but downloaded files are saved at the specified location.
     #' @export
-    download = function(output_dir, selected_indexes, stop_at_failure = TRUE, force = FALSE) {
-      if (self$total_count == 0 || !private$prompt_user_confirmation(self$total_size)) {
+    download = function(output_dir, selected_indexes, stop_at_failure = TRUE, force = FALSE, prompt = TRUE) {
+      if (self$total_count == 0 || (prompt && !private$prompt_user_confirmation(self$total_size))) {
         return(NULL)
       }
 
@@ -127,24 +128,8 @@ SearchResults <- R6::R6Class("SearchResults",
     },
     download_resource = function(download_id, output_dir, force = FALSE) {
       url <- paste0(private$client$apiUrl, "/dataaccess/download/", download_id)
-      req <- httr2::request(url) %>%
-        httr2::req_method("GET")
-
 
-      resp <- private$client$send_request(req, TRUE)
-      if (resp$status_code != 200) {
-        stop(paste("Couldn't download: ", url))
-      }
-
-      # Extract the file name from the Content-Disposition header
-      content_disposition <- httr2::resp_headers(resp, "content-disposition")
-      filename <- if (!is.null(content_disposition)) {
-        gsub('.*filename="?([^"]+)"?.*', "\\1", content_disposition)
-      } else {
-        "downloaded_file"
-      }
-
-      # Define the full file path
+      filename <- private$check_resource_name(url)
       file_path <- file.path(output_dir, filename)
 
       # Check if the file already exists and force flag is FALSE
@@ -153,8 +138,15 @@ SearchResults <- R6::R6Class("SearchResults",
         return(NA)
       }
 
-      writeBin(httr2::resp_body_raw(resp), file_path)
+      req <- httr2::request(url) %>%
+        httr2::req_method("GET")
 
+      resp <- private$client$send_request(req, TRUE)
+      if (resp$status_code != 200) {
+        stop(paste("Couldn't download: ", url))
+      }
+
+      writeBin(httr2::resp_body_raw(resp), file_path)
       return(NA)
     },
     prompt_user_confirmation = function(total_size) {
@@ -172,6 +164,25 @@ SearchResults <- R6::R6Class("SearchResults",
       } else {
         return(TRUE)
       }
+    },
+    check_resource_name = function(url) {
+      req <- httr2::request(url) %>%
+        httr2::req_method("HEAD")
+
+      resp <- private$client$send_request(req, TRUE)
+      if (resp$status_code != 200) {
+        stop(paste("Couldn't download: ", url))
+      }
+
+      # Extract the file name from the Content-Disposition header
+      content_disposition <- httr2::resp_headers(resp, "content-disposition")
+      filename <- if (!is.null(content_disposition)) {
+        gsub('.*filename="?([^"]+)"?.*', "\\1", content_disposition)
+      } else {
+        "downloaded_file"
+      }
+
+      return(filename)
     }
   )
 )

vignettes/hdar.Rmd

@@ -129,7 +129,7 @@ The basic usage of the datasets method is straightforward. You can retrieve a li
 all_datasets <- client$datasets()
 
 # list all datasets IDs on WEkEO
-sapply(filtered_datasets,FUN = function(x){x$dataset_id})
+sapply(all_datasets,FUN = function(x){x$dataset_id})
 ```
 
 ## Filtering Datasets