feat(process): create a ProgressDrawTarget (for indicatif) inside the Process

Author: FranciscoTGouveia

src/cli/download_tracker.rs

@@ -20,17 +20,10 @@ pub(crate) struct DownloadTracker {
 impl DownloadTracker {
     /// Creates a new DownloadTracker.
     pub(crate) fn new_with_display_progress(display_progress: bool, process: &Process) -> Self {
-        let t = process.stdout().terminal(process);
-        let is_a_tty = t.is_a_tty();
-        let multi_progress_bars =
-            MultiProgress::with_draw_target(match process.var("RUSTUP_TERM_PROGRESS_WHEN") {
-                Ok(s) if s.eq_ignore_ascii_case("always") => {
-                    ProgressDrawTarget::term_like(Box::new(t))
-                }
-                Ok(s) if s.eq_ignore_ascii_case("never") => ProgressDrawTarget::hidden(),
-                _ if is_a_tty && display_progress => ProgressDrawTarget::term_like(Box::new(t)),
-                _ => ProgressDrawTarget::hidden(),
-            });
+        let multi_progress_bars = MultiProgress::with_draw_target(process.progress_draw_target());
+        if !display_progress {
+            multi_progress_bars.set_draw_target(ProgressDrawTarget::hidden());
+        }
         Self {
             multi_progress_bars,
             progress_bar: ProgressBar::hidden(),

src/cli/rustup_mode.rs

@@ -14,7 +14,7 @@ use clap::{Args, CommandFactory, Parser, Subcommand, ValueEnum, builder::Possibl
 use clap_complete::Shell;
 use console::style;
 use futures_util::stream::StreamExt;
-use indicatif::{MultiProgress, ProgressBar, ProgressDrawTarget, ProgressStyle};
+use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
 use itertools::Itertools;
 use tracing::{info, trace, warn};
 use tracing_subscriber::{EnvFilter, Registry, reload::Handle};
@@ -797,23 +797,14 @@ async fn default_(
 
 async fn check_updates(cfg: &Cfg<'_>, opts: CheckOpts) -> Result<utils::ExitCode> {
     let t = cfg.process.stdout().terminal(cfg.process);
-    let is_a_tty = t.is_a_tty();
     let use_colors = matches!(t.color_choice(), ColorChoice::Auto | ColorChoice::Always);
     let mut update_available = false;
     let channels = cfg.list_channels()?;
     let num_channels = channels.len();
     // Ensure that `.buffered()` is never called with 0 as this will cause a hang.
     // See: https://github.com/rust-lang/futures-rs/pull/1194#discussion_r209501774
     if num_channels > 0 {
-        let multi_progress_bars =
-            MultiProgress::with_draw_target(match cfg.process.var("RUSTUP_TERM_PROGRESS_WHEN") {
-                Ok(s) if s.eq_ignore_ascii_case("always") => {
-                    ProgressDrawTarget::term_like(Box::new(t))
-                }
-                Ok(s) if s.eq_ignore_ascii_case("never") => ProgressDrawTarget::hidden(),
-                _ if is_a_tty => ProgressDrawTarget::term_like(Box::new(t)),
-                _ => ProgressDrawTarget::hidden(),
-            });
+        let multi_progress_bars = MultiProgress::with_draw_target(cfg.process.progress_draw_target());
         let channels = tokio_stream::iter(channels.into_iter()).map(|(name, distributable)| {
             let pb = multi_progress_bars.add(ProgressBar::new(1));
             pb.set_style(

src/process.rs

@@ -14,6 +14,7 @@ use std::{
 use std::{env, thread};
 
 use anyhow::{Context, Result, bail};
+use indicatif::ProgressDrawTarget;
 #[cfg(feature = "test")]
 use tracing::subscriber::DefaultGuard;
 #[cfg(feature = "test")]
@@ -151,6 +152,24 @@ impl Process {
             Process::TestProcess(p) => Ok(p.cwd.clone()),
         }
     }
+
+    pub fn progress_draw_target(&self) -> ProgressDrawTarget {
+        match self {
+            Process::OsProcess(_) => {
+                let t = self.stdout().terminal(self);
+                match self.var("RUSTUP_TERM_PROGRESS_WHEN") {
+                    Ok(s) if s.eq_ignore_ascii_case("always") => {
+                        ProgressDrawTarget::term_like(Box::new(t))
+                    }
+                    Ok(s) if s.eq_ignore_ascii_case("never") => ProgressDrawTarget::hidden(),
+                    _ if t.is_a_tty() => ProgressDrawTarget::term_like(Box::new(t)),
+                    _ => ProgressDrawTarget::hidden(),
+                }
+            }
+            #[cfg(feature = "test")]
+            Process::TestProcess(_) => ProgressDrawTarget::hidden(),
+        }
+    }
 }
 
 impl home::env::Env for Process {