Use a progress bar for the build phase (#597)
I think this might've been an oversight when copying over the build reporting during the source distribution refactor.
This commit is contained in:
@@ -95,13 +95,10 @@ impl From<Printer> for FetcherReporter {
|
||||
let multi_progress = MultiProgress::with_draw_target(printer.target());
|
||||
|
||||
let progress = multi_progress.add(ProgressBar::with_draw_target(None, printer.target()));
|
||||
progress.enable_steady_tick(Duration::from_millis(200));
|
||||
progress.set_style(
|
||||
ProgressStyle::with_template("{spinner:.white} {wide_msg:.dim}")
|
||||
.unwrap()
|
||||
.tick_strings(&["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]),
|
||||
ProgressStyle::with_template("{bar:20} [{pos}/{len}] {wide_msg:.dim}").unwrap(),
|
||||
);
|
||||
progress.set_message("Resolving dependencies...");
|
||||
progress.set_message("Fetching packages...");
|
||||
|
||||
Self {
|
||||
printer,
|
||||
@@ -135,7 +132,7 @@ impl puffin_distribution::Reporter for FetcherReporter {
|
||||
progress.set_style(ProgressStyle::with_template("{wide_msg}").unwrap());
|
||||
progress.set_message(format!(
|
||||
"{} {}",
|
||||
"Building".bold().green(),
|
||||
"Building".bold().cyan(),
|
||||
dist.to_color_string()
|
||||
));
|
||||
|
||||
@@ -148,7 +145,7 @@ impl puffin_distribution::Reporter for FetcherReporter {
|
||||
let bars = self.bars.lock().unwrap();
|
||||
let progress = &bars[index];
|
||||
progress.finish_with_message(format!(
|
||||
"{} {}",
|
||||
" {} {}",
|
||||
"Built".bold().green(),
|
||||
dist.to_color_string()
|
||||
));
|
||||
@@ -167,7 +164,7 @@ impl puffin_distribution::Reporter for FetcherReporter {
|
||||
progress.set_style(ProgressStyle::with_template("{wide_msg}").unwrap());
|
||||
progress.set_message(format!(
|
||||
"{} {} ({})",
|
||||
"Updating".bold().green(),
|
||||
"Updating".bold().cyan(),
|
||||
url,
|
||||
rev.dimmed()
|
||||
));
|
||||
@@ -182,7 +179,7 @@ impl puffin_distribution::Reporter for FetcherReporter {
|
||||
let bars = self.bars.lock().unwrap();
|
||||
let progress = &bars[index];
|
||||
progress.finish_with_message(format!(
|
||||
"{} {} ({})",
|
||||
" {} {} ({})",
|
||||
"Updated".bold().green(),
|
||||
url,
|
||||
rev.dimmed()
|
||||
@@ -298,7 +295,7 @@ impl puffin_resolver::ResolverReporter for ResolverReporter {
|
||||
progress.set_style(ProgressStyle::with_template("{wide_msg}").unwrap());
|
||||
progress.set_message(format!(
|
||||
"{} {}",
|
||||
"Building".bold().green(),
|
||||
"Building".bold().cyan(),
|
||||
dist.to_color_string()
|
||||
));
|
||||
|
||||
@@ -311,7 +308,7 @@ impl puffin_resolver::ResolverReporter for ResolverReporter {
|
||||
let bars = self.bars.lock().unwrap();
|
||||
let progress = &bars[index];
|
||||
progress.finish_with_message(format!(
|
||||
"{} {}",
|
||||
" {} {}",
|
||||
"Built".bold().green(),
|
||||
dist.to_color_string()
|
||||
));
|
||||
@@ -330,7 +327,7 @@ impl puffin_resolver::ResolverReporter for ResolverReporter {
|
||||
progress.set_style(ProgressStyle::with_template("{wide_msg}").unwrap());
|
||||
progress.set_message(format!(
|
||||
"{} {} ({})",
|
||||
"Updating".bold().green(),
|
||||
"Updating".bold().cyan(),
|
||||
url,
|
||||
rev.dimmed()
|
||||
));
|
||||
@@ -345,7 +342,7 @@ impl puffin_resolver::ResolverReporter for ResolverReporter {
|
||||
let bars = self.bars.lock().unwrap();
|
||||
let progress = &bars[index];
|
||||
progress.finish_with_message(format!(
|
||||
"{} {} ({})",
|
||||
" {} {} ({})",
|
||||
"Updated".bold().green(),
|
||||
url,
|
||||
rev.dimmed()
|
||||
|
||||
@@ -116,17 +116,13 @@ impl std::fmt::Display for Download {
|
||||
|
||||
impl std::fmt::Display for LocalWheel {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
match self {
|
||||
LocalWheel::InMemory(wheel) => write!(f, "{} from {}", wheel.filename, wheel.dist),
|
||||
LocalWheel::Disk(wheel) => write!(f, "{} from {}", wheel.filename, wheel.dist),
|
||||
LocalWheel::Built(wheel) => write!(f, "{} from {}", wheel.filename, wheel.dist),
|
||||
}
|
||||
write!(f, "{}", self.remote())
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for SourceDistDownload {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
write!(f, "{}", self.dist)
|
||||
write!(f, "{}", self.remote())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user