Skip to content
Merged
Show file tree
Hide file tree
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
29 changes: 19 additions & 10 deletions r-package/R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -137,18 +137,27 @@ start_r5r_java <- function(data_path,
fileurl <- fileurl_from_metadata( r5r_env$r5_jar_version )
filename <- basename(fileurl)

jar_file <- data.table::fifelse(
temp_dir,
file.path(tempdir(), filename),
file.path( r5r_env$cache_dir, filename)
)
if (is.null(getOption("r5r.r5jar"))) {
jar_file <- data.table::fifelse(
temp_dir,
file.path(tempdir(), filename),
file.path( r5r_env$cache_dir, filename)
)

# If there isn't a JAR already larger than 60MB, download it
if (checkmate::test_file_exists(jar_file) && file.info(jar_file)$size > r5r_env$r5_jar_size) {
if (!verbose) message("Using cached R5 version from ", jar_file)
# If there isn't a JAR already larger than 60MB, download it
if (checkmate::test_file_exists(jar_file) && file.info(jar_file)$size > r5r_env$r5_jar_size) {
if (!verbose) message("Using cached R5 version from ", jar_file)
} else {
check <- download_r5(temp_dir = temp_dir, quiet = !verbose)
if (is.null(check)) { return(invisible(NULL)) }
}
} else {
check <- download_r5(temp_dir = temp_dir, quiet = !verbose)
if (is.null(check)) { return(invisible(NULL)) }
jar_file <- getOption("r5r.r5jar")
if (checkmate::test_file_exists(jar_file)) {
message("Overriding default R5 with option r5r.r5jar, using ", jar_file)
} else {
stop(paste0("Cannot find r5 jar \"", jar_file, "\", specified in options(r5r.r5jar)"))
}
}

# R5 jar
Expand Down
Binary file modified r-package/inst/jar/r5r.jar
Binary file not shown.
Loading