Thomas преди 1 година
родител
ревизия
d8cfc8fbf2
променени са 3 файла, в които са добавени 14 реда и са изтрити 4 реда
  1. 2 2
      src/in_out/mod.rs
  2. 12 0
      src/utils.rs
  3. 0 2
      src/variants.rs

+ 2 - 2
src/in_out/mod.rs

@@ -6,7 +6,7 @@ use std::{
     io::BufReader,
 };
 
-use crate::utils::new_pg_speed;
+use crate::utils::{new_pg_speed, new_pg_bytes};
 
 pub mod dict_reader;
 pub mod vcf_reader;
@@ -42,7 +42,7 @@ pub fn get_reader_progress(
     assert!(file_type == "gz" || file_type == "vcf");
     let file = File::open(path)?;
     let metadata = file.metadata()?;
-    let pg = mp.add(new_pg_speed(metadata.len() as u64));
+    let pg = mp.add(new_pg_bytes(metadata.len() as u64));
     pg.set_message(format!("Reading {path}"));
 
     let raw_reader: Box<dyn std::io::Read> = Box::new(file);

+ 12 - 0
src/utils.rs

@@ -207,3 +207,15 @@ pub fn new_pg_speed(len: u64) -> ProgressBar {
     pg.enable_steady_tick(Duration::from_millis(200));
     pg
 }
+
+pub fn new_pg_bytes(len: u64) -> ProgressBar {
+    let sty = ProgressStyle::with_template(
+        "  {msg:>7.cyan} [{elapsed_precise}] [{bar:40}] {decimal_bytes:>7}/{decimal_total_bytes:7} {decimal_bytes_per_sec}",
+    )
+    .unwrap()
+    .progress_chars("=>-");
+    let pg = ProgressBar::new(len);
+    pg.set_style(sty);
+    pg.enable_steady_tick(Duration::from_millis(200));
+    pg
+}

+ 0 - 2
src/variants.rs

@@ -860,8 +860,6 @@ impl Variants {
         info!("Loading variants from: {path}");
         let r = in_out::get_reader_progress(path, &mp)?;
         
-
-        
         let data: Vec<Variant> = pot::from_reader(r)?;
         Ok(Self {
             name: name.to_string(),