Merge pull request #637 from adokter/fix_download_pvolfiles

skip day instead of abort when no data available (fix #636)
adokter · Oct 19, 2023 · 7121339 · 7121339
2 parents 0b765f4 + ae0b39a
commit 7121339
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/R/download_pvolfiles.R b/R/download_pvolfiles.R
@@ -97,15 +97,19 @@ download_pvolfiles <- function(date_min, date_max, radar,
     if (nrow(bucket_df) == 0) {
       # Check if date is correct
       prefix_tmp <- paste(gsub("-", "/", dates[i_d]), sep = "/")
-      assertthat::assert_that(assertthat::not_empty(
+      msg <- assertthat::validate_that(assertthat::not_empty(
         aws.s3::get_bucket_df(bucket = bucket, prefix = prefix_tmp, max = 1)
       ),
       msg = paste0(
         "No data availble on the ", dates[i_d],
         ". Please check data availability for this date."
       )
       )
-      assertthat::assert_that(assertthat::not_empty(
+      if(msg != TRUE){
+        warning(msg)
+        next
+      }
+      msg <- assertthat::validate_that(assertthat::not_empty(
         aws.s3::get_bucket_df(bucket = bucket, prefix = prefix, max = 1)
       ),
       msg = paste0(
@@ -114,6 +118,10 @@ download_pvolfiles <- function(date_min, date_max, radar,
         " https://noaa-nexrad-level2.s3.amazonaws.com/index.html"
       )
       )
+      if(msg != TRUE){
+        warning(msg)
+        next
+      }
     }
 
     # filter bucket with exact date
@@ -130,12 +138,17 @@ download_pvolfiles <- function(date_min, date_max, radar,
     # throw out occasional NA keys, see e.g. 2015/03/01/KEPZ/
     bucket_df %>% dplyr::filter(!is.na(.data$Key)) -> bucket_df
 
-    assertthat::assert_that(nrow(bucket_df) > 0,
+    msg <- assertthat::validate_that(nrow(bucket_df) > 0,
       msg = paste0(
         "No data available for ", radar, " on the ", dates[i_d],
         "within the selected datetime range. Check radar code and data availability on",
         " https://noaa-nexrad-level2.s3.amazonaws.com/index.html"
       ))
+    if(msg != TRUE){
+      warning(msg)
+      next
+    }
+
 
     # create progress bar
     message(paste0("\nDownloading pvol for ", prefix))

diff --git a/tests/testthat/test-download_pvolfiles.R b/tests/testthat/test-download_pvolfiles.R
@@ -88,7 +88,7 @@ test_that("date input for download_pvolfiles() ", {
     regexp = "date_max is not greater or equal to date_min",
     fixed = TRUE
   )
-  expect_error(
+  expect_warning(
     suppressMessages(
       download_pvolfiles(
         as.POSIXct("2046-10-02 20:00", tz = "UTC"),
@@ -117,7 +117,7 @@ test_that("Check radar code for download_pvolfiles() ", {
     "radar is not of length 1",
     fixed = TRUE
   )
-  expect_error(
+  expect_warning(
     suppressMessages(
       download_pvolfiles(date_min, date_max, "ABCD", directory, overwrite)
     ),