gitea-mirror/dust
1
0
Fork 0
mirror of https://github.com/bootandy/dust.git synced 2025-12-12 23:59:58 -08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: progress bar: simplify

Browse Source
This commit is contained in:
andy.boot
2023-01-14 16:54:43 +00:00
parent 5bfa44ec77
commit 66ad504848
1 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/progress.rs
View File

@@ -6,7 +6,7 @@ use std::{
Arc, RwLock, Arc, RwLock,
}, },
thread::JoinHandle, thread::JoinHandle,
time::{Duration, Instant}, time::{Duration},
}; };
use crate::display; use crate::display;
@@ -15,7 +15,6 @@ use crate::display;
pub const ATOMIC_ORDERING: Ordering = Ordering::Relaxed; pub const ATOMIC_ORDERING: Ordering = Ordering::Relaxed;
const SHOW_WALKING_AFTER: u64 = 0;
const PROGRESS_CHARS_DELTA: u64 = 100; const PROGRESS_CHARS_DELTA: u64 = 100;
const PROGRESS_CHARS: [char; 4] = ['-', '\\', '|', '/']; const PROGRESS_CHARS: [char; 4] = ['-', '\\', '|', '/'];
const PROGRESS_CHARS_LEN: usize = PROGRESS_CHARS.len(); const PROGRESS_CHARS_LEN: usize = PROGRESS_CHARS.len();
@@ -178,42 +177,38 @@ impl PIndicator {
} }
pub fn spawn(&mut self) { pub fn spawn(&mut self) {
let instant = Instant::now(); let data = self.data.clone();
let data_thread = self.data.clone();
let is_building_data_const = self.thread_run.clone(); let is_building_data_const = self.thread_run.clone();
let time_info_thread = std::thread::spawn(move || { let time_info_thread = std::thread::spawn(move || {
let mut progress_char_i: usize = 0; let mut progress_char_i: usize = 0;
let mut stdout = std::io::stdout(); let mut stdout = std::io::stdout();
let mut msg = "".to_string(); std::thread::sleep(Duration::from_millis(PROGRESS_CHARS_DELTA));
while is_building_data_const.load(ATOMIC_ORDERING) { while is_building_data_const.load(ATOMIC_ORDERING) {
if instant.elapsed() > Duration::from_secs(SHOW_WALKING_AFTER) { let msg = match data.state.get() {
msg = match data_thread.state.get() { Operation::INDEXING => {
Operation::INDEXING => { let base = format_indicator_str(&data, progress_char_i, "Indexing");
let base =
format_indicator_str(&data_thread, progress_char_i, "Indexing");
let file_count = data_thread.file_number.get(); let file_count = data.file_number.get();
let file_str = let file_str =
format!("{} {} files", file_count, data_thread.total_file_size); format!("{} {} files", file_count, data.total_file_size);
format!("{} - {}", base, file_str) format!("{} - {}", base, file_str)
} }
Operation::PREPARING => { Operation::PREPARING => {
format_indicator_str(&data_thread, progress_char_i, "Preparing") format_indicator_str(&data, progress_char_i, "Preparing")
} }
_ => panic!("Unknown State"), _ => panic!("Unknown State"),
}; };
write!(stdout, "{}", msg).unwrap(); write!(stdout, "{}", msg).unwrap();
stdout.flush().unwrap(); stdout.flush().unwrap();
progress_char_i += 1;
progress_char_i %= PROGRESS_CHARS_LEN;
progress_char_i += 1;
progress_char_i %= PROGRESS_CHARS_LEN;
}
std::thread::sleep(Duration::from_millis(PROGRESS_CHARS_DELTA)); std::thread::sleep(Duration::from_millis(PROGRESS_CHARS_DELTA));
// Clear the text written by 'write!' // Clear the text written by 'write!'
print!("\r{:width$}", " ", width = msg.len()); print!("\r{:width$}", " ", width = msg.len());
} }