From 305d9dd3f4679c8026bdd20b18ec9d84e3b770f0 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Tue, 18 May 2021 22:55:55 -0700
Subject: [PATCH] Validator progress bars are now rendered when stdout is not a
 terminal

---
 validator/src/dashboard.rs |  3 +--
 validator/src/lib.rs       | 49 +++++++++++++++++++++++++++++---------
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/validator/src/dashboard.rs b/validator/src/dashboard.rs
index e4a0728b28..d3051afe1a 100644
--- a/validator/src/dashboard.rs
+++ b/validator/src/dashboard.rs
@@ -1,7 +1,6 @@
 use {
-    crate::{admin_rpc_service, new_spinner_progress_bar, println_name_value},
+    crate::{admin_rpc_service, new_spinner_progress_bar, println_name_value, ProgressBar},
     console::style,
-    indicatif::ProgressBar,
     solana_client::{
         client_error, rpc_client::RpcClient, rpc_request, rpc_response::RpcContactInfo,
     },
diff --git a/validator/src/lib.rs b/validator/src/lib.rs
index 2051544e6c..1bff0650fc 100644
--- a/validator/src/lib.rs
+++ b/validator/src/lib.rs
@@ -2,7 +2,7 @@
 pub use solana_core::{cluster_info::MINIMUM_VALIDATOR_PORT_RANGE_WIDTH, test_validator};
 use {
     console::style,
-    indicatif::{ProgressBar, ProgressDrawTarget, ProgressStyle},
+    indicatif::{ProgressDrawTarget, ProgressStyle},
     log::*,
     std::{env, process::exit, thread::JoinHandle},
 };
@@ -91,17 +91,44 @@ pub fn port_range_validator(port_range: String) -> Result<(), String> {
     }
 }
 
-/// Creates a new process bar for processing that will take an unknown amount of time
-pub fn new_spinner_progress_bar() -> ProgressBar {
-    let progress_bar = ProgressBar::new(42);
-    progress_bar.set_draw_target(ProgressDrawTarget::stdout());
-    progress_bar
-        .set_style(ProgressStyle::default_spinner().template("{spinner:.green} {wide_msg}"));
-    progress_bar.enable_steady_tick(100);
-    progress_bar
-}
-
 /// Pretty print a "name value"
 pub fn println_name_value(name: &str, value: &str) {
     println!("{} {}", style(name).bold(), value);
 }
+
+/// Creates a new process bar for processing that will take an unknown amount of time
+pub fn new_spinner_progress_bar() -> ProgressBar {
+    let progress_bar = indicatif::ProgressBar::new(42);
+    progress_bar.set_draw_target(ProgressDrawTarget::stdout());
+    progress_bar
+        .set_style(ProgressStyle::default_spinner().template("{spinner:.green} {wide_msg}"));
+    progress_bar.enable_steady_tick(100);
+
+    ProgressBar {
+        progress_bar,
+        is_term: console::Term::stdout().is_term(),
+    }
+}
+
+pub struct ProgressBar {
+    progress_bar: indicatif::ProgressBar,
+    is_term: bool,
+}
+
+impl ProgressBar {
+    pub fn set_message(&self, msg: &str) {
+        if self.is_term {
+            self.progress_bar.set_message(msg);
+        } else {
+            println!("{}", msg);
+        }
+    }
+
+    pub fn abandon_with_message(&self, msg: &str) {
+        if self.is_term {
+            self.progress_bar.abandon_with_message(msg);
+        } else {
+            println!("{}", msg);
+        }
+    }
+}