Don't duplicate macro

Author: penelopeysm

src/logging.jl

@@ -1,10 +1,10 @@
 # avoid creating a progress bar with @withprogress if progress logging is disabled
 # and add a custom progress logger if the current logger does not seem to be able to handle
 # progress logs
-macro single_ifwithprogresslogger(progress, exprs...)
+macro ifwithprogresslogger(cond, exprs...)
     return esc(
         quote
-            if $progress == true
+            if $cond
                 # If progress == true, then we want to create a new logger. Note that
                 # progress might not be a Bool.
                 if $hasprogresslevel($Logging.current_logger())
@@ -23,25 +23,6 @@ macro single_ifwithprogresslogger(progress, exprs...)
     )
 end
 
-# TODO(penelopeysm): figure out how to not have so much code duplication
-macro multi_ifwithprogresslogger(progress, exprs...)
-    return esc(
-        quote
-            if $progress != :none
-                if $hasprogresslevel($Logging.current_logger())
-                    $ProgressLogging.@withprogress $(exprs...)
-                else
-                    $with_progresslogger($Base.@__MODULE__, $Logging.current_logger()) do
-                        $ProgressLogging.@withprogress $(exprs...)
-                    end
-                end
-            else
-                $(exprs[end])
-            end
-        end,
-    )
-end
-
 macro log_progress_dispatch(progress, progressname, progress_frac)
     return esc(
         quote
@@ -50,7 +31,8 @@ macro log_progress_dispatch(progress, progressname, progress_frac)
             elseif $progress isa $UUIDs.UUID
                 $ProgressLogging.@logprogress $progressname $progress_frac _id = $progress
             else
-                # progress == false, or progress isa Channel, which is handled manually
+                # progress == false, or progress isa Channel, both of which are
+                # handled manually
                 nothing
             end
         end,

src/sample.jl

@@ -161,7 +161,10 @@ function mcmcsample(
     start = time()
     local state
 
-    @single_ifwithprogresslogger progress name = progressname begin
+    # Only create a new progress bar if progress is explicitly equal to true, i.e.
+    # it's not a UUID (the progress bar already exists), a channel (there's no need
+    # for a new progress bar), or false (no progress bar).
+    @ifwithprogresslogger (progress == true) name = progressname begin
         # Determine threshold values for progress logging
         # (one update per 0.5% of progress)
         threshold = Ntotal ÷ 200
@@ -319,7 +322,7 @@ function mcmcsample(
     start = time()
     local state
 
-    @single_ifwithprogresslogger progress name = progressname begin
+    @ifwithprogresslogger (progress == true) name = progressname begin
         # Obtain the initial sample and state.
         sample, state = if num_warmup > 0
             if initial_state === nothing
@@ -456,7 +459,7 @@ function mcmcsample(
     # Set up a chains vector.
     chains = Vector{Any}(undef, nchains)
 
-    @multi_ifwithprogresslogger progress name = progressname begin
+    @ifwithprogresslogger (progress != :none) name = progressname begin
         if progress == :perchain
             # This is the 'overall' progress bar. We create a channel for each
             # chain to report back to when it finishes sampling.
@@ -633,7 +636,7 @@ function mcmcsample(
     pool = Distributed.CachingPool(Distributed.workers())
 
     local chains
-    @single_ifwithprogresslogger progress name = progressname begin
+    @ifwithprogresslogger (progress == true) name = progressname begin
         # Create a channel for progress logging.
         if progress
             channel = Distributed.RemoteChannel(() -> Channel{Bool}(Distributed.nworkers()))