diff --git a/src/nf_modules/UrQt/tests/trimming_single.nf b/src/nf_modules/UrQt/tests/trimming_single.nf index 3160f3b6c4cf075a78ec6e7155f2c18559660ad3..5eb1e84c57b26417e6794af8bbbe03dc5377c7c7 100644 --- a/src/nf_modules/UrQt/tests/trimming_single.nf +++ b/src/nf_modules/UrQt/tests/trimming_single.nf @@ -5,24 +5,25 @@ log.info "fastq files : ${params.fastq}" Channel .fromPath( params.fastq ) .ifEmpty { error "Cannot find any fastq files matching: ${params.fastq}" } + .map { it -> [(it.baseName =~ /([^\.]*)/)[0][1], it]} .set { fastq_files } process trimming { - tag "$reads.baseName" + tag "$file_id" cpus 4 input: - file reads from fastq_files + set file_id, file(reads) from fastq_files output: - file "*_trim.fastq.gz" into fastq_files_trim + set file_id, "*_trim.fastq.gz" into fastq_files_trim script: """ UrQt --t 20 --m ${task.cpus} --gz \ --in ${reads} \ - --out ${reads.baseName}_trim.fastq.gz \ - > ${reads.baseName}_trimming_report.txt + --out ${file_id}_trim.fastq.gz \ + > ${file_id}_trimming_report.txt """ } diff --git a/src/nf_modules/UrQt/urqt.nf b/src/nf_modules/UrQt/urqt.nf index d24033632011796fb1bb3d27185cf62a737444a9..3a0e7d843896f7587a13c1bdfabd01c73f10a122 100644 --- a/src/nf_modules/UrQt/urqt.nf +++ b/src/nf_modules/UrQt/urqt.nf @@ -49,26 +49,24 @@ log.info "fastq files : ${params.fastq}" Channel .fromPath( params.fastq ) .ifEmpty { error "Cannot find any fastq files matching: ${params.fastq}" } + .map { it -> [(it.baseName =~ /([^\.]*)/)[0][1], it]} .set { fastq_files } process trimming { - tag "$reads.baseName" + tag "$file_id" cpus 4 - publishDir "results/fastq/trimming/", mode: 'copy' input: - file reads from fastq_files + set file_id, file(reads) from fastq_files output: - file "*_trim.fastq.gz" into fastq_files_trim + set file_id, "*_trim.fastq.gz" into fastq_files_trim script: -""" - -UrQt --t 20 --m ${task.cpus} --gz \ ---in ${reads} \ ---out ${reads.baseName}_trim.fastq.gz \ -> ${reads.baseName}_trimming_report.txt -""" + """ + UrQt --t 20 --m ${task.cpus} --gz \ + --in ${reads} \ + --out ${file_id}_trim.fastq.gz \ + > ${file_id}_trimming_report.txt + """ } -