Skip to content

Commit e853eac

Browse files
committed
fix xml fallback
1 parent e448597 commit e853eac

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# spanishoddata (development version)
22

3+
## Bug fixes
4+
5+
* Fixed failing fallback on XML when Amazon S3 is unavailable.
6+
37
# spanishoddata 0.2.1 (2025-07-29)
48

59
## Bug fixes

R/available-data.R

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,18 @@ spod_available_data_v1 <- function(
145145
fs::dir_create(metadata_folder)
146146
}
147147

148+
s3_successful <- FALSE
149+
148150
if (use_s3) {
149151
files_table <- tryCatch(
150152
{
151-
spod_available_data_s3(ver = 1, force = force, quiet = quiet)
153+
files_table_s3 <- spod_available_data_s3(
154+
ver = 1,
155+
force = force,
156+
quiet = quiet
157+
)
158+
s3_successful <- TRUE
159+
files_table_s3
152160
},
153161
error = function(e) {
154162
message(
@@ -306,7 +314,7 @@ spod_available_data_v1 <- function(
306314
)
307315

308316
# add known file sizes from cached data
309-
if (use_s3) {
317+
if (s3_successful) {
310318
# replace remote file sizes for v1
311319
replacement_file_sizes_distr <- files_table |>
312320
dplyr::filter(grepl("mitma-distr", .data$local_path)) |>
@@ -497,10 +505,18 @@ spod_available_data_v2 <- function(
497505
fs::dir_create(metadata_folder)
498506
}
499507

508+
s3_successful <- FALSE
509+
500510
if (use_s3) {
501511
files_table <- tryCatch(
502512
{
503-
spod_available_data_s3(ver = 2, force = force, quiet = quiet)
513+
files_table_s3 <- spod_available_data_s3(
514+
ver = 2,
515+
force = force,
516+
quiet = quiet
517+
)
518+
s3_successful <- TRUE
519+
files_table_s3
504520
},
505521
error = function(e) {
506522
message(
@@ -630,7 +646,7 @@ spod_available_data_v2 <- function(
630646
)
631647

632648
# add known file sizes from cached data
633-
if (use_s3) {
649+
if (s3_successful) {
634650
files_table$remote_file_size_mb <- round(
635651
files_table$file_size_bytes / 1024^2,
636652
2

0 commit comments

Comments
 (0)