Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 31 additions & 4 deletions R/data_curation.R
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,7 @@
#' - table_name: "metadata"
#' @export
retrieveMetadata <- function(user_bacs,
genome_id_file = NULL,
filter_type = "AMR",
base_dir = ".",
abx = "All",
Expand All @@ -921,10 +922,34 @@ retrieveMetadata <- function(user_bacs,
base_dir <- normalizePath(base_dir, mustWork = FALSE)

if (isTRUE(verbose)) message("Resolving genome IDs for user inputs.")
genome_ids <- .retrieveQueryIDs(
base_dir = base_dir, user_bacs = user_bacs,
overwrite = overwrite, verbose = verbose
)
# -------------------------------
# GENOME ID RESOLUTION (UPDATED)
# -------------------------------
if (!is.null(genome_id_file)) {
if (!file.exists(genome_id_file)) {
stop("Provided genome_id_file does not exist.")
}

if (isTRUE(verbose)) {
message("Using genome IDs from file: ", genome_id_file)
}

genome_ids <- readLines(genome_id_file, warn = FALSE)
genome_ids <- trimws(genome_ids)
genome_ids <- genome_ids[genome_ids != ""]
} else {
if (isTRUE(verbose)) message("Resolving genome IDs for user inputs.")

genome_ids <- .retrieveQueryIDs(
base_dir = base_dir,
user_bacs = user_bacs,
overwrite = overwrite,
verbose = verbose
)
}

genome_ids <- unique(as.character(genome_ids))

if (length(genome_ids) == 0) {
message("No genome IDs available for the specified inputs.")
return(NULL)
Expand Down Expand Up @@ -1751,6 +1776,7 @@ genomeList <- function(base_dir = ".",
#'
#' @export
prepareGenomes <- function(user_bacs,
genome_id_file = NULL,
base_dir = ".",
method = c("ftp", "cli"),
overwrite = FALSE,
Expand All @@ -1765,6 +1791,7 @@ prepareGenomes <- function(user_bacs,
if (isTRUE(verbose)) message("Step 0: Building AMR metadata (retrieveMetadata)")
invisible(retrieveMetadata(
user_bacs = user_bacs,
genome_id_file = NULL,
filter_type = "AMR",
base_dir = base_dir,
abx = "All",
Expand Down
Loading