Skip to content
Snippets Groups Projects
Commit 29923378 authored by Peter van 't Hof's avatar Peter van 't Hof
Browse files

Fix code warnings

parent e2a873b6
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,7 @@ package nl.lumc.sasc.biopet.pipelines.flexiprep ...@@ -3,7 +3,7 @@ package nl.lumc.sasc.biopet.pipelines.flexiprep
import java.io.File import java.io.File
import nl.lumc.sasc.biopet.core.summary.{ SummaryQScript, Summarizable } import nl.lumc.sasc.biopet.core.summary.{ SummaryQScript, Summarizable }
import nl.lumc.sasc.biopet.core.{ BiopetFifoPipe, BiopetCommandLineFunction, BiopetPipe } import nl.lumc.sasc.biopet.core.{ BiopetFifoPipe, BiopetCommandLineFunction }
import nl.lumc.sasc.biopet.extensions.{ Cat, Gzip, Sickle, Cutadapt } import nl.lumc.sasc.biopet.extensions.{ Cat, Gzip, Sickle, Cutadapt }
import nl.lumc.sasc.biopet.extensions.seqtk.SeqtkSeq import nl.lumc.sasc.biopet.extensions.seqtk.SeqtkSeq
import nl.lumc.sasc.biopet.utils.config.Configurable import nl.lumc.sasc.biopet.utils.config.Configurable
...@@ -73,20 +73,20 @@ class QcCommand(val root: Configurable, val fastqc: Fastqc) extends BiopetComman ...@@ -73,20 +73,20 @@ class QcCommand(val root: Configurable, val fastqc: Fastqc) extends BiopetComman
case _ => None case _ => None
} }
if (seqtk.Q.isDefined) seqtk.V = true if (seqtk.Q.isDefined) seqtk.V = true
seqtk.getVersion addPipeJob(seqtk)
clip = if (!flexiprep.skipClip) { clip = if (!flexiprep.skipClip) {
val foundAdapters = fastqc.foundAdapters.map(_.seq) val foundAdapters = fastqc.foundAdapters.map(_.seq)
if (foundAdapters.nonEmpty) { if (foundAdapters.nonEmpty) {
val cutadept = new Cutadapt(root) val cutadapt = new Cutadapt(root)
cutadept.fastq_input = seqtk.output cutadapt.fastq_input = seqtk.output
cutadept.fastq_output = new File(output.getParentFile, input.getName + ".cutadept.fq") cutadapt.fastq_output = new File(output.getParentFile, input.getName + ".cutadapt.fq")
cutadept.stats_output = new File(flexiprep.outputDir, s"${flexiprep.sampleId.getOrElse("x")}-${flexiprep.libId.getOrElse("x")}.$read.clip.stats") cutadapt.stats_output = new File(flexiprep.outputDir, s"${flexiprep.sampleId.getOrElse("x")}-${flexiprep.libId.getOrElse("x")}.$read.clip.stats")
if (cutadept.default_clip_mode == "3") cutadept.opt_adapter ++= foundAdapters if (cutadapt.default_clip_mode == "3") cutadapt.opt_adapter ++= foundAdapters
else if (cutadept.default_clip_mode == "5") cutadept.opt_front ++= foundAdapters else if (cutadapt.default_clip_mode == "5") cutadapt.opt_front ++= foundAdapters
else if (cutadept.default_clip_mode == "both") cutadept.opt_anywhere ++= foundAdapters else if (cutadapt.default_clip_mode == "both") cutadapt.opt_anywhere ++= foundAdapters
cutadept.getVersion addPipeJob(cutadapt)
Some(cutadept) Some(cutadapt)
} else None } else None
} else None } else None
...@@ -94,17 +94,17 @@ class QcCommand(val root: Configurable, val fastqc: Fastqc) extends BiopetComman ...@@ -94,17 +94,17 @@ class QcCommand(val root: Configurable, val fastqc: Fastqc) extends BiopetComman
val sickle = new Sickle(root) val sickle = new Sickle(root)
sickle.output_stats = new File(flexiprep.outputDir, s"${flexiprep.sampleId.getOrElse("x")}-${flexiprep.libId.getOrElse("x")}.$read.trim.stats") sickle.output_stats = new File(flexiprep.outputDir, s"${flexiprep.sampleId.getOrElse("x")}-${flexiprep.libId.getOrElse("x")}.$read.trim.stats")
sickle.input_R1 = clip match { sickle.input_R1 = clip match {
case Some(clip) => clip.fastq_output case Some(c) => c.fastq_output
case _ => seqtk.output case _ => seqtk.output
} }
sickle.output_R1 = new File(output.getParentFile, input.getName + ".sickle.fq") sickle.output_R1 = new File(output.getParentFile, input.getName + ".sickle.fq")
sickle.getVersion addPipeJob(sickle)
Some(sickle) Some(sickle)
} else None } else None
val outputFile = (clip, trim) match { val outputFile = (clip, trim) match {
case (_, Some(trim)) => trim.output_R1 case (_, Some(t)) => t.output_R1
case (Some(clip), _) => clip.fastq_output case (Some(c), _) => c.fastq_output
case _ => seqtk.output case _ => seqtk.output
} }
...@@ -134,9 +134,9 @@ class QcCommand(val root: Configurable, val fastqc: Fastqc) extends BiopetComman ...@@ -134,9 +134,9 @@ class QcCommand(val root: Configurable, val fastqc: Fastqc) extends BiopetComman
def cmdLine = { def cmdLine = {
val cmd = (clip, trim) match { val cmd = (clip, trim) match {
case (Some(clip), Some(trim)) => new BiopetFifoPipe(root, seqtk :: clip :: trim :: outputCommand :: Nil) case (Some(c), Some(t)) => new BiopetFifoPipe(root, seqtk :: c :: t :: outputCommand :: Nil)
case (Some(clip), _) => new BiopetFifoPipe(root, seqtk :: clip :: outputCommand :: Nil) case (Some(c), _) => new BiopetFifoPipe(root, seqtk :: c :: outputCommand :: Nil)
case (_, Some(trim)) => new BiopetFifoPipe(root, seqtk :: trim :: outputCommand :: Nil) case (_, Some(t)) => new BiopetFifoPipe(root, seqtk :: t :: outputCommand :: Nil)
case _ => new BiopetFifoPipe(root, seqtk :: outputCommand :: Nil) case _ => new BiopetFifoPipe(root, seqtk :: outputCommand :: Nil)
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment