Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initialize multi-progress state before individual bars (#3901) 

## Summary

Resolves https://github.com/astral-sh/uv/issues/3896. Adding progress
bars to the `MultiProgress` after configuring them seems to not
synchronize the required state fully.

## Test Plan

The repeated output is gone when testing locally.
This commit is contained in:
Ibraheem Ahmed 2024-05-29 09:23:40 -04:00 committed by GitHub
parent 1e1f49bfe5
commit 9658485f06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/uv/src/commands/reporters.rs
View File

@ -53,16 +53,13 @@ impl BarState {
}
impl ProgressReporter {
fn new(mut root: ProgressBar, printer: Printer) -> ProgressReporter {
fn new(root: ProgressBar, multi_progress: MultiProgress, printer: Printer) -> ProgressReporter {
let mode = if env::var("JPY_SESSION_NAME").is_ok() {
// Disable concurrent progress bars when running inside a Jupyter notebook
// because the Jupyter terminal does not support clearing previous lines.
// See: https://github.com/astral-sh/uv/issues/3887.
ProgressMode::Single
} else {
let multi_progress = MultiProgress::with_draw_target(printer.target());
root = multi_progress.add(root);
ProgressMode::Multi {
state: Arc::default(),
multi_progress,
@ -238,7 +235,8 @@ pub(crate) struct DownloadReporter {
impl From<Printer> for DownloadReporter {
fn from(printer: Printer) -> Self {
let root = ProgressBar::with_draw_target(None, printer.target());
let multi_progress = MultiProgress::with_draw_target(printer.target());
let root = multi_progress.add(ProgressBar::with_draw_target(None, printer.target()));
root.enable_steady_tick(Duration::from_millis(200));
root.set_style(
ProgressStyle::with_template("{spinner:.white} {msg:.dim} ({pos}/{len})")
@ -247,7 +245,7 @@ impl From<Printer> for DownloadReporter {
);
root.set_message("Downloading packages...");
let reporter = ProgressReporter::new(root, printer);
let reporter = ProgressReporter::new(root, multi_progress, printer);
Self { reporter }
}
}
@ -316,7 +314,8 @@ impl ResolverReporter {
impl From<Printer> for ResolverReporter {
fn from(printer: Printer) -> Self {
let root = ProgressBar::with_draw_target(None, printer.target());
let multi_progress = MultiProgress::with_draw_target(printer.target());
let root = multi_progress.add(ProgressBar::with_draw_target(None, printer.target()));
root.enable_steady_tick(Duration::from_millis(200));
root.set_style(
ProgressStyle::with_template("{spinner:.white} {wide_msg:.dim}")
@ -325,7 +324,7 @@ impl From<Printer> for ResolverReporter {
);
root.set_message("Resolving dependencies...");
let reporter = ProgressReporter::new(root, printer);
let reporter = ProgressReporter::new(root, multi_progress, printer);
Self { reporter }
}
}