X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=blobdiff_plain;f=htsworkflow%2Fsubmission%2Ffastqname.py;h=ac3d5fc4ed59a4ff944588c015ae402fba1b0e53;hp=9dd52a0319fb9e9efa230e68344ef53156645be7;hb=4db6d9f86b96b7b289dc9e6a15b1379418c865ea;hpb=3101ecf2c080bff9e424ad11f4e153546d6723b5 diff --git a/htsworkflow/submission/fastqname.py b/htsworkflow/submission/fastqname.py index 9dd52a0..ac3d5fc 100644 --- a/htsworkflow/submission/fastqname.py +++ b/htsworkflow/submission/fastqname.py @@ -2,8 +2,8 @@ """ import collections import re -PAIRED_TEMPLATE = '{lib_id}_{flowcell}_c{cycle}_l{lane}_r{read}.fastq' -SINGLE_TEMPLATE = '{lib_id}_{flowcell}_c{cycle}_l{lane}.fastq' +PAIRED_TEMPLATE = '{lib_id}_{flowcell}_c{cycle}_l{lane}_r{read}.fastq{compression_extension}' +SINGLE_TEMPLATE = '{lib_id}_{flowcell}_c{cycle}_l{lane}.fastq{compression_extension}' FASTQ_RE = re.compile( '(?P[^_]+)_(?P[^_]+)_'\ @@ -17,7 +17,7 @@ class FastqName(collections.Mapping): Takes filename or common attributes like flowcell, lib_id, lane, read, cycle """ - self._attributes = ('flowcell', 'lib_id', 'lane', 'read', 'cycle') + self._attributes = ('flowcell', 'lib_id', 'lane', 'read', 'cycle', 'compression_extension') self._is_paired = is_paired if len(kwargs) == 0: