One place to define progress bar style

Also no right-side character for no-colour terminals
JuliaLang · Oct 15, 2024 · 350f909 · 350f909
1 parent 38780d1
commit 350f909
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/src/operations.rs b/src/operations.rs
@@ -15,7 +15,7 @@ use crate::utils::is_valid_julia_path;
 use anyhow::{anyhow, bail, Context, Result};
 use bstr::ByteSlice;
 use bstr::ByteVec;
-use console::style;
+use console::{colors_enabled, style};
 #[cfg(not(target_os = "freebsd"))]
 use flate2::read::GzDecoder;
 use indicatif::{ProgressBar, ProgressStyle};
@@ -88,6 +88,19 @@ where
     Ok(())
 }
 
+fn bar_style() -> ProgressStyle {
+    let pchars = if colors_enabled() {
+        "━╸━"
+    } else {
+        "━╸ "
+    };
+
+    ProgressStyle::default_bar()
+        .template("{prefix:.cyan.bold}: {bar:.cyan/black.bright} {bytes}/{total_bytes} eta: {eta}")
+        .unwrap()
+        .progress_chars(pchars)
+}
+
 #[cfg(not(windows))]
 pub fn download_extract_sans_parent(
     url: &str,
@@ -106,14 +119,7 @@ pub fn download_extract_sans_parent(
     };
 
     pb.set_prefix("  Downloading");
-    pb.set_style(
-        ProgressStyle::default_bar()
-            .template(
-                "{prefix:.cyan.bold}: {bar:.cyan/black.bright} {bytes}/{total_bytes} eta: {eta}",
-            )
-            .unwrap()
-            .progress_chars("━╸━"),
-    );
+    pb.set_style(bar_style());
 
     let last_modified = match response
         .headers()
@@ -207,12 +213,7 @@ pub fn download_extract_sans_parent(
     };
 
     pb.set_prefix("  Downloading");
-    pb.set_style(
-        ProgressStyle::default_bar()
-            .template("{prefix:.cyan.bold}: {bar:.cyan/white} {bytes}/{total_bytes} eta: {eta}")
-            .unwrap()
-            .progress_chars("━╸━"),
-    );
+    pb.set_style(bar_style());
 
     let response_with_pb = pb.wrap_read(DataReaderWrap(reader));