BUG FIX: with_progress(..., delay_conditions = "condition") would also capture progress::progress_bar() output [#50]

Author: HenrikBengtsson

NEWS

@@ -12,6 +12,12 @@ NEW FEATURES:
 
  * Added print() for 'progression_handler' objects.
 
+BUG FIXES:
+
+ * with_progress(..., delay_conditions = "condition"), introduced in v0.1.0,
+   would also capture conditions produced by progression handlers, e.g.
+   progress::progress_bar() output would not be displayed until the very end.
+
 
 Version: 0.1.1 [2019-06-08]
 

R/with_progress.R

@@ -129,11 +129,17 @@ with_progress <- function(expr, handlers = getOption("progressr.handlers", txtpr
   }, progression = handler)
 
   ## Evaluate expression
+  capture_conditions <- TRUE
   withCallingHandlers(
     expr,
-    progression = handler,
+    progression = function(p) {
+      ## Don't capture conditions that are produced by progression handlers
+      capture_conditions <<- FALSE
+      on.exit(capture_conditions <<- TRUE)
+      handler(p)
+    },
     condition = function(c) {
-      if (inherits(c, c("progression", "error"))) return()
+      if (!capture_conditions || inherits(c, c("progression", "error"))) return()
       if (inherits(c, delay_conditions)) {
         ## Record
         conditions[[length(conditions) + 1L]] <<- c