foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-21 23:04:45 -05:00
Code Issues Packages 1 Wiki Activity

chore(progress): handle position greater than total size (#24924)

Browse source
This commit is contained in:
David Sherret 2024-08-07 14:01:16 +02:00 committed by GitHub
parent f150a9c2d9
commit 59c9bd0800
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cli/util/progress_bar/mod.rs
View file

@ -44,7 +44,7 @@ impl ProgressMessagePrompt {
#[derive(Debug)]
pub struct UpdateGuard {
maybe_entry: Option<ProgressBarEntry>,
maybe_entry: Option<Arc<ProgressBarEntry>>,
}
impl Drop for UpdateGuard {
@ -75,13 +75,13 @@ pub enum ProgressBarStyle {
TextOnly,
}
#[derive(Clone, Debug)]
#[derive(Debug)]
struct ProgressBarEntry {
id: usize,
prompt: ProgressMessagePrompt,
pub message: String,
pos: Arc<AtomicU64>,
total_size: Arc<AtomicU64>,
pos: AtomicU64,
total_size: AtomicU64,
progress_bar: ProgressBarInner,
}
@ -111,6 +111,8 @@ impl ProgressBarEntry {
let total_size = self.total_size.load(Ordering::Relaxed) as f64;
if total_size == 0f64 {
0f64
} else if pos > total_size {
1f64
} else {
pos / total_size
}
@ -125,7 +127,7 @@ struct InternalState {
start_time: Instant,
keep_alive_count: usize,
total_entries: usize,
entries: Vec<ProgressBarEntry>,
entries: Vec<Arc<ProgressBarEntry>>,
}
#[derive(Clone, Debug)]
@ -152,17 +154,17 @@ impl ProgressBarInner {
&self,
kind: ProgressMessagePrompt,
message: String,
) -> ProgressBarEntry {
) -> Arc<ProgressBarEntry> {
let mut internal_state = self.state.lock();
let id = internal_state.total_entries;
let entry = ProgressBarEntry {
let entry = Arc::new(ProgressBarEntry {
id,
prompt: kind,
message,
pos: Default::default(),
total_size: Default::default(),
progress_bar: self.clone(),
};
});
internal_state.entries.push(entry.clone());
internal_state.total_entries += 1;
internal_state.keep_alive_count += 1;