Files
dust/src/progress.rs
NovaliX f3c074759d Implemented a progress indicator (#275)
* v1.0

* renamed operations to be more clear

* put info later because there is still operations par of the preparing process

* updated the last line clearing

* changed name of module and structs to ones that make more sens

* Disable size computation when file_count option is set

* added sleep during the thread waiting

* use 1024 powered instead of 10 to compute showed number

* include DS_Store

* added files directories skipped information

* small format update

* implement the -H option

* put wait back

* remove PAtomicInfo since it's not used

* cargo fmt

* wrapped atomic operations to reduce overhead

* updated comments

* Use AtomicU64Wrapper instead of AtomicU64 in TotalSize

* update size suffix

* sto dividing size when larger than terabytes

* Fix use_iso flag not be set properly

* update properties display

* some reformating

* use stdout instead of print

* Moved config instance into main because it's easier to read

* merge base formatting into macro

* update name to be more intuitive and separated math operations for more flexibility

* print currently indexed path

* cargo fmt

* reset size between each target dirs

* Access to TotalSize rather than it's inner

* small comment change

* Update sysinfo version to 0.26.7

* fix: update use of sysinfo.system

System is now much quicker to start but requires an explicit call
to refresh memory else it deafults to 0 (oops)

* clippy: Fix new clippy

* fix: bug where hard links could be double counted

When running:
dust dir_a dir_b

if a file was hard linked in both dir_a and dir_b it would be double
counted.

This fix resolves this by keeping the shared hashmap around between runs
for the second and subsequent arguments.
https://github.com/bootandy/dust/issues/282

* Fix: depth=0 bug for multiple arguments

https://github.com/bootandy/dust/issues/282

* refactor filter.rs

* refactor filter.rs

* refactor create AggregateData for filter.rs

* feature: Support for dereference links -L follow

du has -L flag which allows it to dereference or follow
symlinks. Clone this feature into dust.
https://github.com/bootandy/dust/issues/276

* refactor dir_walker

I find this layout cleaner

* v1.0

* changed name of module and structs to ones that make more sens

* Disable size computation when file_count option is set

* added files directories skipped information

* implement the -H option

* wrapped atomic operations to reduce overhead

* used human_readable_number function in display module rather than our own

* implemented progress disabling

* cargo fmt & cargo clippy

Co-authored-by: Guillaume Gomez <guillaume1.gomez@gmail.com>
Co-authored-by: andy.boot <bootandy@gmail.com>
2023-01-14 11:43:22 +00:00

293 lines
8.8 KiB
Rust

use std::{
fmt::Display,
io::Write,
sync::{
atomic::{AtomicBool, AtomicU64, AtomicU8, Ordering},
Arc, RwLock,
},
thread::JoinHandle,
time::{Duration, Instant},
};
use crate::display;
/* -------------------------------------------------------------------------- */
pub const ATOMIC_ORDERING: Ordering = Ordering::Relaxed;
// small wrappers for atomic number to reduce overhead
pub trait ThreadSyncTrait<T> {
fn set(&self, val: T);
fn get(&self) -> T;
}
pub trait ThreadSyncMathTrait<T> {
fn add(&self, val: T);
}
macro_rules! create_atomic_wrapper {
($ident: ident, $atomic_type: ty, $type: ty, $ordering: ident) => {
#[derive(Default)]
pub struct $ident {
inner: $atomic_type,
}
impl ThreadSyncTrait<$type> for $ident {
fn set(&self, val: $type) {
self.inner.store(val, $ordering)
}
fn get(&self) -> $type {
self.inner.load($ordering)
}
}
};
($ident: ident, $atomic_type: ty, $type: ty, $ordering: ident + add) => {
create_atomic_wrapper!($ident, $atomic_type, $type, $ordering);
impl ThreadSyncMathTrait<$type> for $ident {
fn add(&self, val: $type) {
self.inner.fetch_add(val, $ordering);
}
}
};
}
create_atomic_wrapper!(AtomicU64Wrapper, AtomicU64, u64, ATOMIC_ORDERING + add);
create_atomic_wrapper!(AtomicU8Wrapper, AtomicU8, u8, ATOMIC_ORDERING + add);
#[derive(Default)]
pub struct ThreadStringWrapper {
inner: RwLock<String>,
}
impl ThreadSyncTrait<String> for ThreadStringWrapper {
fn set(&self, val: String) {
*self.inner.write().unwrap() = val;
}
fn get(&self) -> String {
(*self.inner.read().unwrap()).clone()
}
}
/* -------------------------------------------------------------------------- */
// creating an enum this way allows to have simpler syntax compared to a Mutex or a RwLock
#[allow(non_snake_case)]
pub mod Operation {
pub const INDEXING: u8 = 0;
pub const PREPARING: u8 = 1;
}
#[derive(Default)]
pub struct PAtomicInfo {
pub file_number: AtomicU64Wrapper,
pub files_skipped: AtomicU64Wrapper,
pub directories_skipped: AtomicU64Wrapper,
pub total_file_size: TotalSize,
pub state: AtomicU8Wrapper,
pub current_path: ThreadStringWrapper,
}
impl PAtomicInfo {
fn new(c: &PConfig) -> Self {
Self {
total_file_size: TotalSize::new(c),
..Default::default()
}
}
}
/* -------------------------------------------------------------------------- */
#[derive(Default)]
pub struct TotalSize {
use_iso: bool,
inner: AtomicU64Wrapper,
}
impl TotalSize {
fn new(c: &PConfig) -> Self {
Self {
use_iso: c.use_iso,
..Default::default()
}
}
}
impl Display for TotalSize {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.write_str(&display::human_readable_number(
self.inner.get(),
self.use_iso,
))
}
}
impl ThreadSyncTrait<u64> for TotalSize {
fn set(&self, val: u64) {
self.inner.set(val)
}
fn get(&self) -> u64 {
self.inner.get()
}
}
impl ThreadSyncMathTrait<u64> for TotalSize {
fn add(&self, val: u64) {
self.inner.add(val)
}
}
/* -------------------------------------------------------------------------- */
#[derive(Default)]
pub struct PConfig {
pub file_count_only: bool,
pub ignore_hidden: bool,
pub use_iso: bool,
}
pub struct PIndicator {
thread_run: Arc<AtomicBool>,
thread: JoinHandle<()>,
pub data: Arc<PAtomicInfo>,
pub config: Arc<PConfig>,
}
impl PIndicator {
pub fn spawn(config: PConfig) -> Self {
macro_rules! init_shared_data {
(let $ident: ident, $ident2: ident = $value: expr) => {
let $ident = Arc::new($value);
let $ident2 = $ident.clone();
};
}
init_shared_data!(let instant, instant2 = Instant::now());
init_shared_data!(let time_thread_run, time_thread_run2 = AtomicBool::new(true));
init_shared_data!(let config, config2 = config);
init_shared_data!(let data, data2 = PAtomicInfo::new(&config));
let time_info_thread = std::thread::spawn(move || {
const SHOW_WALKING_AFTER: u64 = 0;
const PROGRESS_CHARS_DELTA: u64 = 100;
const PROGRESS_CHARS: [char; 4] = ['-', '\\', '|', '/'];
const PROGRESS_CHARS_LEN: usize = PROGRESS_CHARS.len();
let mut progress_char_i: usize = 0;
let mut stdout = std::io::stdout();
let mut last_msg_len = 0;
while time_thread_run2.load(ATOMIC_ORDERING) {
if instant2.elapsed() > Duration::from_secs(SHOW_WALKING_AFTER) {
// print!("{:?}", *state2.read().unwrap());
// clear the line
print!("\r{:width$}", " ", width = last_msg_len);
macro_rules! format_base {
($state: expr) => {
format!(
"\r{} \"{}\"... {}",
$state,
data2.current_path.get(),
PROGRESS_CHARS[progress_char_i],
)
};
}
let msg = match data2.state.get() {
Operation::INDEXING => {
const PROPS_SEPARATOR: &str = ", ";
let base = format_base!("Indexing");
macro_rules! format_property {
($value: ident, $singular: expr, $plural: expr) => {
format!(
"{} {}",
$value,
if $value > 1 { $plural } else { $singular }
)
};
}
let mut main_props = Vec::new();
let fn_ = data2.file_number.get();
if config2.file_count_only {
main_props.push(format_property!(fn_, "file", "files"));
} else {
main_props.push(format!("{}", data2.total_file_size));
main_props.push(format_property!(fn_, "file", "files"));
};
let main_props_str = main_props.join(PROPS_SEPARATOR);
let base = format!("{} - {}", base, main_props_str);
let ds = data2.directories_skipped.get();
let fs = data2.files_skipped.get();
if ds + fs != 0 {
let mut strs = Vec::new();
if fs != 0 {
strs.push(format_property!(fs, "file", "files"))
}
if ds != 0 {
strs.push(format_property!(ds, "directory", "directories"))
}
format!("{} ({} skipped)", base, strs.join(", "))
} else {
base
}
}
Operation::PREPARING => {
format_base!("Preparing")
}
_ => panic!("Unknown State"),
};
last_msg_len = msg.len();
write!(stdout, "{}", msg).unwrap();
stdout.flush().unwrap();
progress_char_i += 1;
progress_char_i %= PROGRESS_CHARS_LEN;
std::thread::sleep(Duration::from_millis(PROGRESS_CHARS_DELTA));
} else {
// wait duration is in seconds so we need only to check each second
std::thread::sleep(Duration::from_secs(1));
}
}
// clear the line for the last time
print!("\r{:width$}", " ", width = last_msg_len);
// Return at the start of the line so the output can be printed correctly
print!("\r");
stdout.flush().unwrap();
});
Self {
thread_run: time_thread_run,
thread: time_info_thread,
data,
config,
}
}
pub fn stop(self) {
self.thread_run.store(false, ATOMIC_ORDERING);
self.thread.join().unwrap();
}
}