Skip to content

Commit a4625f0

Browse files
committed
skip day instead of abort when no data available (fix #636)
1 parent 0b765f4 commit a4625f0

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

R/download_pvolfiles.R

+16-3
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,19 @@ download_pvolfiles <- function(date_min, date_max, radar,
9797
if (nrow(bucket_df) == 0) {
9898
# Check if date is correct
9999
prefix_tmp <- paste(gsub("-", "/", dates[i_d]), sep = "/")
100-
assertthat::assert_that(assertthat::not_empty(
100+
msg <- assertthat::validate_that(assertthat::not_empty(
101101
aws.s3::get_bucket_df(bucket = bucket, prefix = prefix_tmp, max = 1)
102102
),
103103
msg = paste0(
104104
"No data availble on the ", dates[i_d],
105105
". Please check data availability for this date."
106106
)
107107
)
108-
assertthat::assert_that(assertthat::not_empty(
108+
if(msg != TRUE){
109+
warning(msg)
110+
next
111+
}
112+
msg <- assertthat::validate_that(assertthat::not_empty(
109113
aws.s3::get_bucket_df(bucket = bucket, prefix = prefix, max = 1)
110114
),
111115
msg = paste0(
@@ -114,6 +118,10 @@ download_pvolfiles <- function(date_min, date_max, radar,
114118
" https://noaa-nexrad-level2.s3.amazonaws.com/index.html"
115119
)
116120
)
121+
if(msg != TRUE){
122+
warning(msg)
123+
next
124+
}
117125
}
118126

119127
# filter bucket with exact date
@@ -130,12 +138,17 @@ download_pvolfiles <- function(date_min, date_max, radar,
130138
# throw out occasional NA keys, see e.g. 2015/03/01/KEPZ/
131139
bucket_df %>% dplyr::filter(!is.na(.data$Key)) -> bucket_df
132140

133-
assertthat::assert_that(nrow(bucket_df) > 0,
141+
msg <- assertthat::validate_that(nrow(bucket_df) > 0,
134142
msg = paste0(
135143
"No data available for ", radar, " on the ", dates[i_d],
136144
"within the selected datetime range. Check radar code and data availability on",
137145
" https://noaa-nexrad-level2.s3.amazonaws.com/index.html"
138146
))
147+
if(msg != TRUE){
148+
warning(msg)
149+
next
150+
}
151+
139152

140153
# create progress bar
141154
message(paste0("\nDownloading pvol for ", prefix))

0 commit comments

Comments
 (0)