gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dl-utils: use wide_msg everywhere for truncation on narrow terminals (#16554)

Browse Source 
(cherry picked from commit e61b4b7d70)

Co-authored-by: Trent Nelson <trent@solana.com>
This commit is contained in:
mergify[bot]
2021-04-15 01:09:41 +00:00
committed by GitHub
parent 98867430d5
commit b555845ca2
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
download-utils/src/lib.rs
View File

@ -74,15 +74,12 @@ pub fn download_file(
progress_bar.set_length(download_size);
progress_bar.set_style(
ProgressStyle::default_bar()
.template(&format!(
"{}{}Downloading {} {}",
"{spinner:.green} ",
TRUCK,
url,
"[{bar:40.cyan/blue}] {bytes}/{total_bytes} ({eta})"
))
.template(
"{spinner:.green}{msg_wide}[{bar:40.cyan/blue}] {bytes}/{total_bytes} ({eta})",
)
.progress_chars("=> "),
);
progress_bar.set_message(&format!("{}Downloading~ {}", TRUCK, url));
} else {
info!("Downloading {} bytes from {}", download_size, url);
}

18
install/src/command.rs
View File

@ -109,14 +109,12 @@ fn download_to_temp(
progress_bar.set_length(download_size);
progress_bar.set_style(
ProgressStyle::default_bar()
.template(&format!(
"{}{}{}",
"{spinner:.green} ",
TRUCK,
"Downloading [{bar:40.cyan/blue}] {bytes}/{total_bytes} ({eta})"
))
.template(
"{spinner:.green}{wide_msg} [{bar:40.cyan/blue}] {bytes}/{total_bytes} ({eta})",
)
.progress_chars("=> "),
);
progress_bar.set_message(&format!("{}Downloading", TRUCK));
struct DownloadProgress<R> {
progress_bar: ProgressBar,
@ -824,14 +822,10 @@ pub fn gc(config_file: &str) -> Result<(), String> {
progress_bar.set_length(old_releases.len() as u64);
progress_bar.set_style(
ProgressStyle::default_bar()
.template(&format!(
"{}{}{}",
"{spinner:.green} ",
RECYCLING,
"Removing old releases [{bar:40.cyan/blue}] {pos}/{len} ({eta})"
))
.template("{spinner:.green}{wide_msg} [{bar:40.cyan/blue}] {pos}/{len} ({eta})")
.progress_chars("=> "),
);
progress_bar.set_message(&format!("{}Removing old releases", RECYCLING));
for (release, _modified_type) in old_releases {
progress_bar.inc(1);
let _ = fs::remove_dir_all(&release);