From 9d4e04308d8edc9f73c4b9192cb7e9cff394eec9 Mon Sep 17 00:00:00 2001 From: Egor Kotov Date: Sat, 7 Sep 2024 08:47:22 +0200 Subject: [PATCH 1/4] make sure to create metadata cache folder --- R/get.R | 8 +++++++- R/get_v1_data.R | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/R/get.R b/R/get.R index f9c2078..69f9bd1 100644 --- a/R/get.R +++ b/R/get.R @@ -139,7 +139,13 @@ spod_available_data_v2 <- function( check_local_files = FALSE, quiet = FALSE ) { - xml_files_list <- fs::dir_ls(glue::glue("{data_dir}/{spod_subfolder_metadata_cache()}"), type = "file", regexp = "data_links_v2") |> sort() + + metadata_folder <- glue::glue("{data_dir}/{spod_subfolder_metadata_cache()}") + if{!fs::dir_exists(metadata_folder)}{ + fs::dir_create(metadata_folder) + } + + xml_files_list <- fs::dir_ls(metadata_folder, type = "file", regexp = "data_links_v2") |> sort() if (length(xml_files_list) == 0) { if (isFALSE(quiet)) { message("No data links xml files found, getting latest v2 data links xml.") diff --git a/R/get_v1_data.R b/R/get_v1_data.R index 167cc45..96c45df 100644 --- a/R/get_v1_data.R +++ b/R/get_v1_data.R @@ -55,7 +55,13 @@ spod_available_data_v1 <- function( # check_local_files (below) is FALSE by default to avoid excessive filesystem access, perhaps should be TRUE. Download functions use it to load the xml file, but we probably do not want the script to check all local cache directories every time we run a get data function. Perhaps it is better to offload this check to a separate function and have a csv file or some other way to keep track of the files that were downloaded and cached. An output of curl::multi_download() could be used for this purpose. check_local_files = FALSE, quiet = FALSE) { - xml_files_list <- fs::dir_ls(glue::glue("{data_dir}/{spod_subfolder_metadata_cache()}"), type = "file", regexp = "data_links_v1") |> sort() + + metadata_folder <- glue::glue("{data_dir}/{spod_subfolder_metadata_cache()}") + if{!fs::dir_exists(metadata_folder)}{ + fs::dir_create(metadata_folder) + } + + xml_files_list <- fs::dir_ls(metadata_folder), type = "file", regexp = "data_links_v1") |> sort() if (length(xml_files_list) == 0) { if (isFALSE(quiet)) { message("No data links xml files found, getting latest v1 data links xml") From a2aa76a7870769b296db11d7e602029da2a1b666 Mon Sep 17 00:00:00 2001 From: Egor Kotov Date: Sat, 7 Sep 2024 08:50:42 +0200 Subject: [PATCH 2/4] typo fix --- R/get.R | 2 +- R/get_v1_data.R | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/R/get.R b/R/get.R index 69f9bd1..e5f57ce 100644 --- a/R/get.R +++ b/R/get.R @@ -141,7 +141,7 @@ spod_available_data_v2 <- function( ) { metadata_folder <- glue::glue("{data_dir}/{spod_subfolder_metadata_cache()}") - if{!fs::dir_exists(metadata_folder)}{ + if{!fs::dir_exists(metadata_folder){ fs::dir_create(metadata_folder) } diff --git a/R/get_v1_data.R b/R/get_v1_data.R index 96c45df..60ad0b3 100644 --- a/R/get_v1_data.R +++ b/R/get_v1_data.R @@ -57,7 +57,7 @@ spod_available_data_v1 <- function( quiet = FALSE) { metadata_folder <- glue::glue("{data_dir}/{spod_subfolder_metadata_cache()}") - if{!fs::dir_exists(metadata_folder)}{ + if{!fs::dir_exists(metadata_folder){ fs::dir_create(metadata_folder) } From 55b97268c191d38a49ec41194d0527c0ba489e6b Mon Sep 17 00:00:00 2001 From: Egor Kotov Date: Sat, 7 Sep 2024 08:51:12 +0200 Subject: [PATCH 3/4] typo fix --- R/get_v1_data.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/get_v1_data.R b/R/get_v1_data.R index 60ad0b3..034e144 100644 --- a/R/get_v1_data.R +++ b/R/get_v1_data.R @@ -61,7 +61,7 @@ spod_available_data_v1 <- function( fs::dir_create(metadata_folder) } - xml_files_list <- fs::dir_ls(metadata_folder), type = "file", regexp = "data_links_v1") |> sort() + xml_files_list <- fs::dir_ls(metadata_folder, type = "file", regexp = "data_links_v1") |> sort() if (length(xml_files_list) == 0) { if (isFALSE(quiet)) { message("No data links xml files found, getting latest v1 data links xml") From d6a2b5fdd07568e3ba8b8ef96e0f87115c90e25b Mon Sep 17 00:00:00 2001 From: Egor Kotov Date: Sat, 7 Sep 2024 08:51:47 +0200 Subject: [PATCH 4/4] typo fix --- R/get.R | 2 +- R/get_v1_data.R | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/R/get.R b/R/get.R index e5f57ce..730ae2e 100644 --- a/R/get.R +++ b/R/get.R @@ -141,7 +141,7 @@ spod_available_data_v2 <- function( ) { metadata_folder <- glue::glue("{data_dir}/{spod_subfolder_metadata_cache()}") - if{!fs::dir_exists(metadata_folder){ + if(!fs::dir_exists(metadata_folder)){ fs::dir_create(metadata_folder) } diff --git a/R/get_v1_data.R b/R/get_v1_data.R index 034e144..85eddcb 100644 --- a/R/get_v1_data.R +++ b/R/get_v1_data.R @@ -57,7 +57,7 @@ spod_available_data_v1 <- function( quiet = FALSE) { metadata_folder <- glue::glue("{data_dir}/{spod_subfolder_metadata_cache()}") - if{!fs::dir_exists(metadata_folder){ + if(!fs::dir_exists(metadata_folder)){ fs::dir_create(metadata_folder) }