diff --git a/CHANGELOG.md b/CHANGELOG.md index 0062af4..3aafaf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ Initial release of nf-core/seqinspector, created with the [nf-core](https://nf-c - [#53](https://github.com/nf-core/seqinspector/pull/53) Add FastQ-Screen database multiplexing and limit scope of nf-test in CI. - [#96](https://github.com/nf-core/seqinspector/pull/96) Added missing citations to citation tool - [#103](https://github.com/nf-core/seqinspector/pull/103) Configure full-tests +- [#110](https://github.com/nf-core/seqinspector/pull/110) Update input schema to accept either tar file or directory as rundir, and fastq messages and patterns. ### `Fixed` diff --git a/assets/schema_input.json b/assets/schema_input.json index 97ec617..c879c73 100644 --- a/assets/schema_input.json +++ b/assets/schema_input.json @@ -17,21 +17,31 @@ "type": "string", "format": "file-path", "exists": true, - "pattern": "^\\S+\\.f(ast)?q\\.gz$", - "errorMessage": "FastQ file for reads 1 must be provided, cannot contain spaces and must have extension '.fq.gz' or '.fastq.gz'" + "pattern": "\\.f(ast)?q\\.gz$", + "errorMessage": "FastQ files for read 1 must be provided and must have extension '.fq.gz' or '.fastq.gz'" }, "fastq_2": { "type": "string", "format": "file-path", "exists": true, - "pattern": "^\\S+\\.f(ast)?q\\.gz$", - "errorMessage": "FastQ file for reads 2 cannot contain spaces and must have extension '.fq.gz' or '.fastq.gz'" + "pattern": "\\.f(ast)?q\\.gz$", + "errorMessage": "FastQ files for read 2 are optional and must have extension '.fq.gz' or '.fastq.gz' if provided" }, "rundir": { - "type": "string", - "format": "path", - "exists": true, - "errorMessage": "Run directory must be a path", + "oneOf": [ + { + "type": "string", + "format": "file-path", + "exists": true, + "pattern": "\\.tar\\.gz$" + }, + { + "type": "string", + "format": "directory-path", + "exists": true + } + ], + "errorMessage": "Run directory must be a path or tar directory", "meta": ["rundir"] }, "tags": {