From e903338d19564afbc2b57d353fb1f846db4d11e6 Mon Sep 17 00:00:00 2001 From: Ben Raymond Date: Mon, 5 Feb 2024 11:01:36 +1100 Subject: [PATCH] strip embedded quotes from Copernicus etags v0.14.2 --- DESCRIPTION | 2 +- R/copernicus_handler.R | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 9b433b2..028ddf7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: bowerbird Type: Package Title: Keep a Collection of Sparkly Data Resources -Version: 0.14.1 +Version: 0.14.2 Authors@R: c(person("Ben", "Raymond", email = "ben.raymond@aad.gov.au", role = c("aut", "cre")), person("Michael", "Sumner", role = "aut"), person("Miles", "McBain", email = "miles.mcbain@gmail.com", role = c("rev", "ctb")), diff --git a/R/copernicus_handler.R b/R/copernicus_handler.R index 7f64c1f..e81d3cb 100644 --- a/R/copernicus_handler.R +++ b/R/copernicus_handler.R @@ -55,6 +55,7 @@ bb_handler_copernicus_inner <- function(config, verbose = FALSE, local_dir_only myfiles <- if (ctype == "file") cms_list_stac_single_file(product) else CopernicusMarine::cms_list_stac_files(product) ## layer is ignored in this? if (nrow(myfiles) < 1) stop("No files found for Copernicus Marine product: ", product) if (!all(c("home", "native", "current_path", "ETag") %in% names(myfiles))) stop("file list does not have the expected columns, has there been a change to the format returned by `CopernicusMarine::cms_list_stac_files()`?") + myfiles$ETag <- sub("^\"", "", sub("\"$", "", myfiles$ETag)) if (!"url" %in% names(myfiles)) myfiles$url <- paste0("https://", file.path(myfiles$home, myfiles$native, myfiles$current_path)) ## take the `current_path` of each file and find the product ID pidx <- stringr::str_locate(myfiles$current_path, stringr::fixed(paste0(product, "/")))