fix logic for preloadData

jasp-stats · Oct 11, 2024 · 648c77e · 648c77e
1 parent 15aefc3
commit 648c77e
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/R/options.R b/R/options.R
@@ -297,8 +297,22 @@ parsePreloadDataFromDescriptionQml <- function(analysisName) {
 
   description <- parseDescriptionQmlFromAnalysisName(analysisName)
 
-  preloadData <- isTRUE(description[["Description"]][["preloadData"]]) || isTRUE(description[[analysisName]][["preloadData"]])
-  if (!preloadData)
+  # is the preloadData globally set to TRUE?
+  preloadDataGlobal <- isTRUE(description[["Description"]][["preloadData"]])
+  # is the preloadData even set for this specific analysis?
+  specifiedPreloadData <- "preloadData" %in% names(description[[analysisName]])
+  # is the preloadData set to TRUE for this specific analysis?
+  preloadDataAnalysis <- specifiedPreloadData && isTRUE(description[[analysisName]][["preloadData"]])
+  # preloadData if set to TRUE for the analysis or if set globally to TRUE and not set for the analysis
+  preloadData <- preloadDataAnalysis || (preloadDataGlobal && !specifiedPreloadData)
+
+  #             global  analysis  -> result warning
+  # preloadData TRUE    TRUE      -> TRUE
+  #             TRUE    FALSE     -> FALSE
+  #             FALSE   TRUE      -> TRUE
+  #             FALSE   FALSE     -> FALSE
+
+  if (!preloadData && !specifiedPreloadData)
     lifecycle::deprecate_warn(
       when = "0.19.2",
       what = I(sprintf("The analysis `%s` does not preload data. Please update inst/Description.qml, add `preloadData: true`, and fix any minor issues.", analysisName))