From 8f1e5cf714bb239e9187444046ed838fb655dee1 Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis Date: Wed, 27 Nov 2024 22:38:49 +0100 Subject: [PATCH] fix layer progress missing --- lib/src/deploy.rs | 49 +++++++++++++++++++++---------------------- ostree-ext/src/cli.rs | 1 + 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/src/deploy.rs b/lib/src/deploy.rs index f35d1268e..a3ef07f34 100644 --- a/lib/src/deploy.rs +++ b/lib/src/deploy.rs @@ -168,35 +168,34 @@ async fn handle_layer_progress_print( let start = std::time::Instant::now(); let mut total_read = 0u64; let bar = indicatif::MultiProgress::new(); - // Stage bar hidden to avoid temporary flash - bar.set_draw_target(indicatif::ProgressDrawTarget::hidden()); - let layers_bar = bar.add(indicatif::ProgressBar::new( - layers_download.try_into().unwrap(), - )); - let byte_bar = bar.add(indicatif::ProgressBar::new(0)); - let total_byte_bar = bar.add(indicatif::ProgressBar::new(bytes_download)); - let mut last_json_written = std::time::Instant::now(); - layers_bar.set_style( - indicatif::ProgressStyle::default_bar() - .template("{prefix} {pos}/{len} {bar:15}") - .unwrap(), + if quiet { + bar.set_draw_target(indicatif::ProgressDrawTarget::hidden()); + } + let layers_bar = bar.add( + indicatif::ProgressBar::new(layers_download as u64) + .with_prefix("\nFetched Layers") + .with_style( + indicatif::ProgressStyle::default_bar() + .template("{prefix} {pos}/{len} {bar:15}") + .unwrap(), + ), ); - layers_bar.set_prefix("Fetched Layers"); + // Force an update layers_bar.set_message(""); - byte_bar.set_style( - indicatif::ProgressStyle::default_bar() - .template(" └ {bar:20} {msg} ({binary_bytes}/{binary_total_bytes})") - .unwrap(), + let byte_bar = bar.add( + indicatif::ProgressBar::new(0).with_style( + indicatif::ProgressStyle::default_bar() + .template(" └ {bar:20} {msg} ({binary_bytes}/{binary_total_bytes})") + .unwrap(), + ), ); - total_byte_bar.set_prefix("Total"); - total_byte_bar.set_style( + let total_byte_bar = bar.add(indicatif::ProgressBar::new(bytes_download).with_prefix("Total").with_style( indicatif::ProgressStyle::default_bar() - .template("\n{prefix} {bar:30} {binary_bytes}/{binary_total_bytes} ({binary_bytes_per_sec}, {elapsed}/{duration})") - .unwrap(), - ); - if !quiet { - bar.set_draw_target(indicatif::ProgressDrawTarget::stderr()); - } + .template("\n{prefix} {bar:30} {binary_bytes}/{binary_total_bytes} ({binary_bytes_per_sec}, {elapsed}/{duration})") + .unwrap(), + )); + + let mut last_json_written = std::time::Instant::now(); loop { tokio::select! { // Always handle layer changes first. diff --git a/ostree-ext/src/cli.rs b/ostree-ext/src/cli.rs index 9f3ed8752..bc555904a 100644 --- a/ostree-ext/src/cli.rs +++ b/ostree-ext/src/cli.rs @@ -657,6 +657,7 @@ pub async fn handle_layer_progress_print( pub fn print_layer_status(prep: &PreparedImport) { if let Some(status) = prep.format_layer_status() { println!("{status}"); + let _ = std::io::stdout().flush(); } }