From 414bc9e5a7866870059524e4775c234feec0b0a9 Mon Sep 17 00:00:00 2001
From: "andy.boot" <bootandy@gmail.com>
Date: Sat, 14 Jan 2023 17:28:38 +0000
Subject: [PATCH] Refactor: Progress bar: Remove PConfig

---
 src/dir_walker.rs |  2 --
 src/main.rs       | 14 ++-------
 src/progress.rs   | 76 +++++++----------------------------------------
 3 files changed, 13 insertions(+), 79 deletions(-)

diff --git a/src/dir_walker.rs b/src/dir_walker.rs
index e9e9f14..4d9e19a 100644
--- a/src/dir_walker.rs
+++ b/src/dir_walker.rs
@@ -4,7 +4,6 @@ use std::sync::Arc;
 use crate::node::Node;
 use crate::progress;
 use crate::progress::PAtomicInfo;
-use crate::progress::PConfig;
 use crate::progress::ThreadSyncMathTrait;
 use crate::progress::ThreadSyncTrait;
 use crate::utils::is_filtered_out_due_to_invert_regex;
@@ -32,7 +31,6 @@ pub struct WalkData<'a> {
     pub by_filecount: bool,
     pub ignore_hidden: bool,
     pub follow_links: bool,
-    pub progress_config: Option<Arc<PConfig>>,
     pub progress_data: Option<Arc<PAtomicInfo>>,
 }
 
diff --git a/src/main.rs b/src/main.rs
index 24bbbfd..9062a44 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -13,7 +13,6 @@ mod utils;
 use crate::cli::build_cli;
 use dir_walker::WalkData;
 use filter::AggregateData;
-use progress::PConfig;
 use progress::PIndicator;
 use std::collections::HashSet;
 use std::io::BufRead;
@@ -178,19 +177,13 @@ fn main() {
     let info_indicator = if disable_progress {
         None
     } else {
-        let conf = PConfig {
-            use_iso: iso,
-        };
-        let mut indicator = PIndicator::build_me(conf);
-        indicator.spawn();
+        let mut indicator = PIndicator::build_me();
+        indicator.spawn(iso);
         Some(indicator)
     };
 
     // Must be a cleaner way to do this
-    let (tmp_config, tmp_data) = match &info_indicator {
-        Some(i) => (Some(Arc::clone(&i.config)), Some(Arc::clone(&i.data))),
-        None => (None, None),
-    };
+    let tmp_data = info_indicator.as_ref().map(|i| Arc::clone(&i.data));
 
     let walk_data = WalkData {
         ignore_directories: ignored_full_path,
@@ -202,7 +195,6 @@ fn main() {
         ignore_hidden,
         follow_links,
         // Maybe just arc::clone the whole PIndicator and send that down here:
-        progress_config: tmp_config,
         progress_data: tmp_data,
     };
 
diff --git a/src/progress.rs b/src/progress.rs
index a91fb4b..06cc13b 100644
--- a/src/progress.rs
+++ b/src/progress.rs
@@ -1,15 +1,14 @@
 use std::{
-    fmt::Display,
     io::Write,
     sync::{
         atomic::{AtomicBool, AtomicU64, AtomicU8, Ordering},
         Arc, RwLock,
     },
     thread::JoinHandle,
-    time::{Duration},
+    time::Duration,
 };
 
-use crate::display;
+use crate::display::human_readable_number;
 
 /* -------------------------------------------------------------------------- */
 
@@ -87,62 +86,13 @@ pub mod Operation {
 
 #[derive(Default)]
 pub struct PAtomicInfo {
+    // pub file_number: AtomicUsize::new(0),
     pub file_number: AtomicU64Wrapper,
-    pub total_file_size: TotalSize,
+    pub total_file_size: AtomicU64Wrapper,
     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)
-    }
-}
 
 /* -------------------------------------------------------------------------- */
 fn format_indicator_str(data: &PAtomicInfo, progress_char_i: usize, s: &str) -> String {
@@ -154,29 +104,22 @@ fn format_indicator_str(data: &PAtomicInfo, progress_char_i: usize, s: &str) ->
     )
 }
 
-#[derive(Default)]
-pub struct PConfig {
-    pub use_iso: bool,
-}
-
 pub struct PIndicator {
     thread_run: Arc<AtomicBool>,
     pub thread: Option<JoinHandle<()>>,
     pub data: Arc<PAtomicInfo>,
-    pub config: Arc<PConfig>,
 }
 
 impl PIndicator {
-    pub fn build_me(c: PConfig) -> Self {
+    pub fn build_me() -> Self {
         Self {
             thread_run: Arc::new(AtomicBool::new(true)),
             thread: None,
-            data: Arc::new(PAtomicInfo::new(&c)),
-            config: Arc::new(c),
+            data: Arc::new(PAtomicInfo{..Default::default()}),
         }
     }
 
-    pub fn spawn(&mut self) {
+    pub fn spawn(&mut self, is_iso: bool) {
         let data = self.data.clone();
         let is_building_data_const = self.thread_run.clone();
 
@@ -191,8 +134,9 @@ impl PIndicator {
                         let base = format_indicator_str(&data, progress_char_i, "Indexing");
 
                         let file_count = data.file_number.get();
-                        let file_str =
-                            format!("{} {} files", file_count, data.total_file_size);
+                        let size = human_readable_number(data.total_file_size.get(), is_iso);
+                        let file_str = format!("{} {} files", file_count, size);
+                        // let file_str = format!("{} {} files", file_count, data.total_file_size);
 
                         format!("{} - {}", base, file_str)
                     }