chore: Better default fallback message

tidyverse · Mar 8, 2024 · 8198166 · 8198166
1 parent bd33d6f
commit 8198166
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/R/fallback.R b/R/fallback.R
@@ -73,13 +73,13 @@ fallback_sitrep <- function() {
     fallback_txt_header(),
 
     if (is.na(fallback_logging)) {
-      c("i" = "Fallback logging is not controlled. Enable or disable it by setting the {.envvar DUCKPLYR_FALLBACK_COLLECT} environment variable.")
+      c("i" = "Fallback logging is not controlled and therefore disabled. Enable or disable it by setting the {.envvar DUCKPLYR_FALLBACK_COLLECT} environment variable.")
     } else if (fallback_logging) {
       c(
         "v" = "Fallback logging is enabled.",
         "i" = "Logs are written to {.file {fallback_log_dir}}.",
         if (is.na(fallback_verbose)) {
-          c("i" = "Fallback printing is not controlled. Enable or disable it by setting the {.envvar DUCKPLYR_FALLBACK_VERBOSE} environment variable.")
+          c("i" = "Fallback printing is not controlled and therefore disabled. Enable or disable it by setting the {.envvar DUCKPLYR_FALLBACK_VERBOSE} environment variable.")
         } else if (fallback_verbose) {
           c("v" = "Fallback printing is enabled.")
         } else {
@@ -91,7 +91,12 @@ fallback_sitrep <- function() {
     },
 
     fallback_txt_uploading(fallback_uploading),
-    fallback_txt_sitrep_logs(fallback_logs)
+
+    if (isTRUE(fallback_logging)) {
+      fallback_txt_sitrep_logs(fallback_logs)
+    },
+
+    NULL
   )
 
   cli_inform(msg)
@@ -103,7 +108,7 @@ fallback_txt_header <- function() {
 
 fallback_txt_uploading <- function(fallback_uploading) {
   if (is.na(fallback_uploading)) {
-    c("i" = "Fallback uploading is not controlled. Enable or disable it by setting the {.envvar DUCKPLYR_FALLBACK_AUTOUPLOAD} environment variable.")
+    c("i" = "Fallback uploading is not controlled and therefore disabled. Enable or disable it by setting the {.envvar DUCKPLYR_FALLBACK_AUTOUPLOAD} environment variable.")
   } else if (fallback_uploading) {
     c("v" = "Fallback uploading is enabled.")
   } else {

diff --git a/tests/testthat/_snaps/fallback.md b/tests/testthat/_snaps/fallback.md
@@ -4,9 +4,8 @@
       fallback_sitrep()
     Message
       The duckplyr package is configured to fall back to dplyr when it encounters an incompatibility. Fallback events can be collected and uploaded for analysis to guide future development. See `?duckplyr::fallback()` for details.
-      i Fallback logging is not controlled. Enable or disable it by setting the `DUCKPLYR_FALLBACK_COLLECT` environment variable.
-      i Fallback uploading is not controlled. Enable or disable it by setting the `DUCKPLYR_FALLBACK_AUTOUPLOAD` environment variable.
-      i No reports ready for upload.
+      i Fallback logging is not controlled and therefore disabled. Enable or disable it by setting the `DUCKPLYR_FALLBACK_COLLECT` environment variable.
+      i Fallback uploading is not controlled and therefore disabled. Enable or disable it by setting the `DUCKPLYR_FALLBACK_AUTOUPLOAD` environment variable.
 
 # fallback_sitrep() enabled
 
@@ -42,8 +41,6 @@
       The duckplyr package is configured to fall back to dplyr when it encounters an incompatibility. Fallback events can be collected and uploaded for analysis to guide future development. See `?duckplyr::fallback()` for details.
       x Fallback logging is disabled.
       x Fallback uploading is disabled.
-      v Number of reports ready for upload: 3.
-      > Review with `duckplyr::fallback_review()`, upload with `duckplyr::fallback_upload()`.
 
 # fallback_nudge()