Your Name 1 rok temu
rodzic
commit
ee85bffde2
4 zmienionych plików z 8 dodań i 4 usunięć
  1. 1 0
      src/assembler/mod.rs
  2. 1 0
      src/assembler/spades.rs
  3. 1 0
      src/assembler/wtdbg2.rs
  4. 5 4
      src/lib.rs

+ 1 - 0
src/assembler/mod.rs

@@ -210,6 +210,7 @@ pub fn default_save(
     tmp_dir: String,
 ) -> anyhow::Result<()> {
     if contigs.is_none() {
+        fs::remove_dir_all(tmp_dir)?;
         anyhow::bail!(AssembleError::NoContig(input_id));
     }
 

+ 1 - 0
src/assembler/spades.rs

@@ -115,6 +115,7 @@ impl Assemble for Spades {
             }
             self.contigs = Some(contigs);
         } else {
+            fs::remove_dir_all(tmp_dir)?;
             anyhow::bail!(AssembleError::NoContig(self.input_id));
         }
 

+ 1 - 0
src/assembler/wtdbg2.rs

@@ -117,6 +117,7 @@ impl Assemble for Wtdbg2 {
             }
             self.contigs = Some(contigs);
         } else {
+            fs::remove_dir_all(tmp_dir)?;
             anyhow::bail!(AssembleError::NoContig(self.input_id));
         }
 

+ 5 - 4
src/lib.rs

@@ -81,11 +81,12 @@ mod tests {
     #[test]
     fn spades_whole() {
         init();
-        let id = "ROBIN";
+        let id = "ACHITE";
+        let tp = "mrd";
 
         let res_dir = "/data/longreads_basic_pipe";
-        let asm_dir = format!("{res_dir}/{id}/diag/scan/reads");
-        let output_dir = format!("{res_dir}/{id}/diag/assemblies");
+        let asm_dir = format!("{res_dir}/{id}/{tp}/scan/reads");
+        let output_dir = format!("{res_dir}/{id}/{tp}/assemblies");
 
         let res = assemble_whole(
             &asm_dir,
@@ -105,7 +106,7 @@ mod tests {
         // let input_id = "12677262-102018167_2c45";
         // let chr = "chr10";
 
-        let id = "ROBIN";
+        let id = "DAHAN";
         let input_id = "143063957-143063957_8a24";
         let chr = "chr9";