Merge pull request #185 from darrenldl/dev

Updated progress reporting units to bytes

src/decode_core.rs

@@ -496,11 +496,12 @@ impl ProgressReport for Stats {
         (self.meta_blocks_decoded
             + self.data_blocks_decoded
             + self.parity_blocks_decoded
-            + blocks_decode_failed) as u64
+            + blocks_decode_failed)
+            * ver_to_block_size(self.version) as u64
     }
 
     fn total_units(&self) -> Option<u64> {
-        Some(self.total_blocks)
+        Some(self.total_blocks * ver_to_block_size(self.version) as u64)
     }
 }
 
@@ -702,7 +703,7 @@ pub fn decode(
             reporter = ProgressReporter::new(
                 &stats,
                 "Data decoding progress",
-                "blocks",
+                "bytes",
                 param.pr_verbosity_level,
                 param.json_printer.json_enabled(),
             );
@@ -819,7 +820,7 @@ pub fn decode(
             reporter = ProgressReporter::new(
                 &stats,
                 "Data decoding progress",
-                "blocks",
+                "bytes",
                 param.pr_verbosity_level,
                 param.json_printer.json_enabled(),
             );

src/encode_core.rs

@@ -259,11 +259,14 @@ impl ProgressReport for Stats {
     }
 
     fn units_so_far(&self) -> u64 {
-        self.data_blocks_written as u64
+        self.data_blocks_written as u64 * ver_to_data_size(self.version) as u64
     }
 
     fn total_units(&self) -> Option<u64> {
-        self.total_data_blocks
+        match self.total_data_blocks {
+            None => None,
+            Some(x) => Some(x * ver_to_data_size(self.version) as u64),
+        }
     }
 }
 
@@ -509,7 +512,7 @@ pub fn encode_file(param: &Param) -> Result<Stats, Error> {
     let reporter = ProgressReporter::new(
         &stats,
         "Data encoding progress",
-        "chunks",
+        "bytes",
         param.pr_verbosity_level,
         param.json_printer.json_enabled(),
     );

src/repair_core.rs

@@ -71,11 +71,12 @@ impl ProgressReport for Stats {
     }
 
     fn units_so_far(&self) -> u64 {
-        self.meta_blocks_decoded + self.data_or_par_blocks_decoded + self.blocks_decode_failed
+        (self.meta_blocks_decoded + self.data_or_par_blocks_decoded + self.blocks_decode_failed)
+            * ver_to_block_size(self.version) as u64
     }
 
     fn total_units(&self) -> Option<u64> {
-        Some(self.total_blocks)
+        Some(self.total_blocks * ver_to_block_size(self.version) as u64)
     }
 }
 
@@ -295,7 +296,7 @@ pub fn repair_file(param: &Param) -> Result<Option<Stats>, Error> {
     let reporter = Arc::new(ProgressReporter::new(
         &stats,
         "SBX block repairing progress",
-        "blocks",
+        "bytes",
         param.pr_verbosity_level,
         param.json_printer.json_enabled(),
     ));

src/sort_core.rs

@@ -150,11 +150,12 @@ impl ProgressReport for Stats {
             + self.data_blocks_decoded
             + self.parity_blocks_decoded
             + self.blocks_decode_failed
-            + self.okay_blank_blocks) as u64
+            + self.okay_blank_blocks)
+            * ver_to_block_size(self.version) as u64
     }
 
     fn total_units(&self) -> Option<u64> {
-        Some(self.total_blocks)
+        Some(self.total_blocks * ver_to_block_size(self.version) as u64)
     }
 }
 
@@ -258,7 +259,7 @@ pub fn sort_file(param: &Param) -> Result<Option<Stats>, Error> {
     let reporter = Arc::new(ProgressReporter::new(
         &stats,
         "SBX block sorting progress",
-        "blocks",
+        "bytes",
         param.pr_verbosity_level,
         param.json_printer.json_enabled(),
     ));