format progress bars

Author: ctoney

R/load_tree_data.R

@@ -224,7 +224,8 @@ load_tree_data <- function(src, table = NULL, columns = DEFAULT_TREE_COLUMNS,
     if (is.null(sql) && !is.null(columns) && columns[1] != "")
         ds$setSelectedFields(columns)
 
-    cli::cli_progress_step("Fetching tree data...")
+    cli::cli_progress_step("Fetching tree data...",
+                           msg_done = "Fetching tree data.")
     d <- ds$fetch(-1)
     cli::cli_progress_done()
 

R/process_tree_data.R

@@ -89,6 +89,9 @@ process_tree_data <- function(tree_table, stem_map = TRUE, full_output = TRUE,
     tree_list <- tree_table[tree_table$PLT_CN == plot_ids[1], ]
     x <- calc_tcc_metrics(tree_list, stem_map, full_output, digits, window = w)
 
+    cli::cli_alert_info(
+        "The input table contains tree data for {.val {num_plots}} plots.")
+
     out <- vector("list", 1 + length(x))
     names(out) <- c("PLT_CN", names(x))
 
@@ -109,10 +112,14 @@ process_tree_data <- function(tree_table, stem_map = TRUE, full_output = TRUE,
             out[[j]] <- rep_len(NA_real_, num_plots)
     }
 
-    cli::cli_alert_info(
-        "The input table contains tree data for {.val {num_plots}} plots.")
+    cli::cli_progress_bar(
+        "Processing...",
+        format_done = paste0(
+            "{cli::col_green(cli::symbol$tick)} Processed ",
+            "{.val {cli::pb_total}} plots in {cli::pb_elapsed}."),
+        total = num_plots,
+        clear = FALSE)
 
-    cli::cli_progress_bar("Processing...", total = num_plots)
     for (i in seq_along(plot_ids)) {
         tree_list <- tree_table[tree_table$PLT_CN == plot_ids[i], ]
         x <- calc_tcc_metrics(tree_list, stem_map, full_output, digits,
@@ -124,7 +131,6 @@ process_tree_data <- function(tree_table, stem_map = TRUE, full_output = TRUE,
         cli::cli_progress_update()
     }
     cli::cli_progress_done()
-    cli::cli_alert_info("Done.")
 
     as.data.frame(out)
 }

README.md

@@ -300,7 +300,7 @@ f <- system.file("extdata/mt_lnf_2022_1cond_tree.csv", package="FIAstemmap")
 tree_table <- load_tree_data(f)
 #> ! the data source does not have DIST and/or AZIMUTH
 #> ℹ Fetching tree data...
-#> ✔ Fetching tree data... [14ms]
+#> ✔ Fetching tree data. [14ms]
 #> 
 #> ℹ 910 tree records returned.
 
@@ -315,7 +315,6 @@ head(tree_table)
 
 process_tree_data(tree_table, stem_map = FALSE, full_output = TRUE)
 #> ℹ The input table contains tree data for 22 plots.
-#> ℹ Done.
 #>             PLT_CN model_tcc numTrees meanTreeHt meanTreeHtBAW meanTreeHtDom
 #> 1  670951075126144       1.2        0        0.0           0.0           0.0
 #> 2  670950940126144      38.4       24       61.4          66.4          64.5