Browse Source

all working

Thomas 1 year ago
parent
commit
5515a91a6d
2 changed files with 9 additions and 4 deletions
  1. 7 1
      src/lib.rs
  2. 2 3
      src/variants.rs

+ 7 - 1
src/lib.rs

@@ -29,7 +29,7 @@ mod tests {
 
     #[test]
     fn load_from_vcf() -> Result<()> {
-        let name = "CAMARA";
+        let name = "PENN";
         let logger =
             env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info"))
                 .build();
@@ -93,6 +93,12 @@ mod tests {
         }
 
         let db_path = "/data/db_results.sqlite".to_string();
+        // `${data_dir}/${name}/diag/${name}_variants.sqlite`
+        let db_path = format!(
+            "{}/{name}/diag/{name}_variants.sqlite",
+            cfg.longreads_results_dir
+        );
+
         let loh_path = format!(
             "{}/{name}/diag/{name}_loh.vcf.gz",
             cfg.longreads_results_dir

+ 2 - 3
src/variants.rs

@@ -17,7 +17,7 @@ use crate::{
         self,
         dict_reader::read_dict,
         get_reader,
-        vcf_reader::{read_vcf, read_vcf_progress, VCFRow},
+        vcf_reader::{read_vcf, VCFRow},
         vcf_writer::{vcf_header_from, VariantWritter},
     },
     sql::{stats_sql::insert_stats, variants_sql::insert_variants},
@@ -26,7 +26,7 @@ use crate::{
         new_pg_speed, print_stat_cat,
     },
 };
-use anyhow::{anyhow, Context, Error, Ok, Result};
+use anyhow::{anyhow, Context, Ok, Result};
 use csv::ReaderBuilder;
 use dashmap::DashMap;
 use hashbrown::HashMap;
@@ -51,7 +51,6 @@ use std::{
 };
 
 // chr12:25116542|G>T KRAS
-
 #[derive(Debug, Clone)]
 pub struct Variants {
     pub name: String,