addded information on total file size being downloaded as an information

ropensci · Feb 15, 2024 · 0add3e3 · 0add3e3
1 parent 6ea036a
commit 0add3e3
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/R/ct_get_data.R b/R/ct_get_data.R
@@ -184,7 +184,8 @@ ct_get_data <- function(type = "goods",
   } else{
     resp <- ct_perform_request(req,
                                requests_per_second = requests_per_second,
-                               verbose = verbose
+                               verbose = verbose,
+                               bulk = bulk
     )
   }
 

diff --git a/R/ct_perform_request.R b/R/ct_perform_request.R
@@ -13,7 +13,7 @@
 #' @noRd
 #' @returns JSON data from comtrade, data.frame with results or error codes.
 #' @inheritParams ct_get_data
-ct_perform_request <- function(req, requests_per_second, verbose = FALSE) {
+ct_perform_request <- function(req, requests_per_second, verbose = FALSE, bulk) {
   if (verbose) {
     cli::cli_inform(c("i" = "Performing request, which can take a few seconds, depending on the amount of data queried.")) # nolint
   }
@@ -40,10 +40,17 @@ ct_perform_request <- function(req, requests_per_second, verbose = FALSE) {
     ) |>
     httr2::req_perform()
 
-  if (verbose) {
-    cli::cli_inform(c("v" = "Got a response object from UN Comtrade. Use `process = F` if there is an error after this step to find issues with the response object.")) # nolint
+  if(bulk){
+    if (verbose) {
+      cli::cli_inform(c("v" = "Got a response object from UN Comtrade."))
+    }
+  } else {
+    if (verbose) {
+      cli::cli_inform(c("v" = "Got a response object from UN Comtrade. Use `process = F` if there is an error after this step to find issues with the response object.")) # nolint
+    }
   }
 
+
   return(resp)
 }
 

diff --git a/R/utils.R b/R/utils.R
@@ -404,3 +404,30 @@ replace_month <- function(date_str) {
   )
   stringr::str_replace_all(date_str, months)
 }
+
+
+#' convert file size from comtrade
+#'
+#' @noRd
+convert_file_size <- function(file_sizes) {
+  units <- c(KB = 1024, MB = 1024^2, GB = 1024^3, TB = 1024^4)
+  sapply(file_sizes, function(x) {
+    parts <- strsplit(x, " ")[[1]]
+    number <- as.numeric(parts[1])
+    unit <- units[toupper(parts[2])]
+    number * unit
+  })
+}
+
+#' format file size from comtrade
+#'
+#' @noRd
+format_file_size <- function(size_in_bytes) {
+  units <- c("B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB")
+  if (size_in_bytes == 0) {
+    return("0 B")
+  }
+  i <- floor(log(size_in_bytes, 1024))
+  p <- size_in_bytes / 1024^i
+  paste0(format(p, digits = 3, nsmall = 1), " ", units[i + 1])
+}