fix: clear_cache reuses previous set_cache settings

Author: dshemetov

R/cache.R

@@ -3,6 +3,7 @@
 cache_environ <- new.env(parent = emptyenv())
 cache_environ$use_cache <- NULL
 cache_environ$epidatr_cache <- NULL
+cache_environ$cache_args <- NULL
 
 #' Create or renew a cache for this session
 #' @aliases set_cache
@@ -169,6 +170,12 @@ set_cache <- function(cache_dir = NULL,
       max_age = days * 24 * 60 * 60,
       logfile = file.path(cache_dir, logfile)
     )
+    cache_environ$cache_args <- list2(
+      cache_dir = cache_dir,
+      days = days,
+      max_size = max_size,
+      logfile = logfile
+    )
   }
 
   cli::cli_inform(c(
@@ -183,9 +190,9 @@ set_cache <- function(cache_dir = NULL,
 #' Manually reset the cache, deleting all currently saved data and starting afresh
 #' @description
 #' Deletes the current cache and resets a new cache. Deletes local data! If you
-#'   are using a session unique cache, you will have to pass the arguments you
-#'   used for `set_cache` earlier, otherwise the system-wide `.Renviron`-based
-#'   defaults will be used.
+#'   are using a session unique cache, the previous settings will be reused. If
+#'   you pass in new `set_cache` arguments, they will take precedence over the
+#'   previous settings.
 #' @param disable instead of setting a new cache, disable caching entirely;
 #'   defaults to `FALSE`
 #' @inheritDotParams set_cache
@@ -198,11 +205,22 @@ set_cache <- function(cache_dir = NULL,
 clear_cache <- function(..., disable = FALSE) {
   if (any(!is.na(cache_environ$epidatr_cache))) {
     cache_environ$epidatr_cache$destroy()
+    recovered_args <- cache_environ$cache_args
+    cache_environ$cache_args <- NULL
+  } else {
+    recovered_args <- list()
   }
+  args <- rlang::dots_list(
+    ...,
+    confirm = FALSE,
+    !!!recovered_args,
+    .homonyms = "first",
+    .ignore_empty = "all"
+  )
   if (disable) {
     cache_environ$epidatr_cache <- NULL
   } else {
-    set_cache(...)
+    rlang::inject(set_cache(!!!args))
   }
 }
 

tests/testthat/test-cache.R

@@ -1,8 +1,3 @@
-test_that("basic cache setup", {
-  # Should be off at the start
-  expect_true(is.null(cache_environ$epidatr_cache))
-})
-
 new_temp_dir <- tempdir()
 test_set_cache <- function(cache_dir = new_temp_dir,
                            days = 1,
@@ -18,6 +13,11 @@ test_set_cache <- function(cache_dir = new_temp_dir,
   )
 }
 
+test_that("basic cache setup", {
+  # Should be off at the start
+  expect_true(is.null(cache_environ$epidatr_cache))
+})
+
 test_that("cache set as expected", {
   # Setup a new cache
   expect_message(test_set_cache())
@@ -85,7 +85,7 @@ test_that("cache saves & loads", {
   expect_equal(first_call, direct_from_cache[[1]])
 
   # Test the empty return branch
-  expect_message(clear_cache(confirm = FALSE))
+  expect_message(clear_cache())
   local_mocked_bindings(
     # see generate_test_data.R
     content = function(...) {