# HG changeset patch
# User iuc
# Date 1674409910 0
# Node ID 9a776b08019313a7f52367711ffee3e233380fa0
# Parent  83c7d564b1282e53f2c2811b81ac8399d24ec4f6
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/sra-tools commit cbb1499906c801443d72bdf313d86f0182aca010

diff -r 83c7d564b128 -r 9a776b080193 fasterq_dump.xml
--- a/fasterq_dump.xml	Fri Sep 03 16:17:53 2021 +0000
+++ b/fasterq_dump.xml	Sun Jan 22 17:51:50 2023 +0000
@@ -1,22 +1,21 @@
-<tool id="fasterq_dump" name="Faster Download and Extract Reads in FASTQ" version="@VERSION@+galaxy1" profile="18.01">
+<tool id="fasterq_dump" name="Faster Download and Extract Reads in FASTQ" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="@PROFILE@">
     <description>format from NCBI SRA</description>
-    <expand macro="bio_tools"/>
     <macros>
-        <import>sra_macros.xml</import>
+        <import>macros.xml</import>
     </macros>
+    <expand macro="edam_ontology"/>
+    <expand macro="bio_tools"/>
     <expand macro="requirements"/>
-    <version_command>fasterq-dump --version</version_command>
+    <version_command>fasterq-dump --version | tr -d $'\n'</version_command>
     <command detect_errors="exit_code"><![CDATA[
     set -o | grep -q pipefail && set -o pipefail;
     @COPY_CONFIGFILE@
+    @CONFIGURE_RETRY@
     @SET_ACCESSIONS@
-    #if $input.input_select == "file":
-        acc='${input.file.name}' &&
-        ln -s '${input.file}' "\$acc" &&
-    #end if
-    @CONFIGURE_RETRY@
     while [ \$SRA_PREFETCH_ATTEMPT -le \$SRA_PREFETCH_RETRIES ] ; do
         fasterq-dump "\$acc" -e \${GALAXY_SLOTS:-1}
+        --seq-defline '@\$sn/\$ri'
+        --qual-defline '+'
         $adv.split
         #if str( $adv.minlen ) != "":
             --min-read-len "$adv.minlen"
@@ -33,7 +32,7 @@
     mkdir -p output &&
     mkdir -p outputOther &&
     count="\$(ls *.fastq | wc -l)" &&
-    echo "There are \$count fastq" &&
+    echo "There are \$count fastq files" &&
     data=(\$(ls *.fastq)) &&
     if [ "\$count" -eq 1 ]; then
         @COMPRESS@ "\${data[0]}" > output/"\${acc}"__single.fastqsanger.gz &&
@@ -61,13 +60,11 @@
             rm "\$file";
         done;
     fi;
-    #if $input.input_select=="file_list":
-        ) ; done
-
-        ;
-    #elif  $input.input_select=="accession_number":
-    );
+    
+    #if $input.input_select != "sra_file":
+        ); done;
     #end if
+    echo "Done with all accessions."
     ]]>
     </command>
     <expand macro="configfile_hack"/>
@@ -109,10 +106,8 @@
             <param name="accession" value="ERR086330"/>
             <output_collection name="list_paired" type="list:paired" count="1">
                 <element name="ERR086330">
-                    <element name="forward" file="ERR086330_1.fastq.gz" decompress="True">
-                    </element>
-                    <element name="reverse" file="ERR086330_2.fastq.gz" decompress="True">
-                    </element>
+                    <element name="forward" file="ERR086330_1.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
+                    <element name="reverse" file="ERR086330_2.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
                 </element>
             </output_collection>
         </test>
@@ -127,22 +122,34 @@
             </output_collection>
         </test>
         <test expect_num_outputs="4">
-            <param name="input_select" value="file"/>
-            <param name="file" value="SRR522874.sra"/>
+            <param name="input_select" value="accession_number"/>
+            <param name="accession" value="ERR086330, SRR11953971"/>
+            <output_collection name="list_paired" type="list:paired" count="2">
+                <element name="ERR086330">
+                    <element name="forward" file="ERR086330_1.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
+                    <element name="reverse" file="ERR086330_2.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
+                </element>
+                <element name="SRR11953971">
+                    <element name="forward" file="SRR11953971_1.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
+                    <element name="reverse" file="SRR11953971_2.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
+                </element>
+            </output_collection>
+        </test>
+        <test expect_num_outputs="4">
+            <param name="input_select" value="sra_file"/>
+            <param name="sra_file" value="SRR522874.sra"/>
             <param name="split" value="--split-files"/>
             <param name="skip_technical" value="True"/>
             <output_collection name="list_paired" type="list:paired" count="1">
                 <element name="SRR522874.sra">
-                    <element name="forward" file="SRR522874.sra_2.fastq.gz" decompress="True">
-                    </element>
-                    <element name="reverse" file="SRR522874.sra_4.fastq.gz" decompress="True">
-                    </element>
+                    <element name="forward" file="SRR522874.sra_2.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
+                    <element name="reverse" file="SRR522874.sra_4.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
                 </element>
             </output_collection>
         </test>
         <test expect_num_outputs="4">
-            <param name="input_select" value="file"/>
-            <param name="file" value="SRR522874.sra"/>
+            <param name="input_select" value="sra_file"/>
+            <param name="sra_file" value="SRR522874.sra"/>
             <param name="split" value="--split-files"/>
             <param name="skip_technical" value="False"/>
             <output_collection name="output_collection_other" type="list" count="4">
@@ -156,16 +163,16 @@
             <param name="input_select" value="file_list"/>
             <param name="file_list" value="list_sra"/>
             <param name="minlen" value="21"/>
-            <output_collection name="output_collection_other" type="list">
+            <output_collection name="output_collection_other" type="list" count="1">
                 <element name="SRR522874__single" file="SRR522874.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
             </output_collection>
             <output_collection name="list_paired" type="list:paired" count="1">
                 <element name="SRR522874">
-                    <element name="forward" file="SRR522874_1.fastq.gz" decompress="True"/>
-                    <element name="reverse" file="SRR522874_2.fastq.gz" decompress="True"/>
+                    <element name="forward" file="SRR522874_1.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
+                    <element name="reverse" file="SRR522874_2.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
                 </element>
             </output_collection>
-            <output_collection name="output_collection" type="list">
+            <output_collection name="output_collection" type="list" count="1">
                 <element name="SRR002702" file="SRR002702_2.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
             </output_collection>
         </test>
@@ -174,8 +181,8 @@
             <param name="file_list" value="sra_manifest.tabular" ftype="sra_manifest.tabular"/>
             <output_collection name="list_paired" type="list:paired" count="1">
                 <element name="SRR11953971">
-                    <element name="forward" file="SRR11953971_1.fastq.gz" decompress="True"/>
-                    <element name="reverse" file="SRR11953971_2.fastq.gz" decompress="True"/>
+                    <element name="forward" file="SRR11953971_1.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
+                    <element name="reverse" file="SRR11953971_2.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
                 </element>
             </output_collection>
         </test>
@@ -183,51 +190,20 @@
     <help><![CDATA[
 **What it does?**
 
-This tool extracts data (in fastq_ format) from the Short Read Archive (SRA) at the National Center for Biotechnology Information (NCBI). It is based on the fasterq-dump_ utility of the SRA Toolkit.
-
-**How to use it?**
-
-There are three ways in which you can download data:
-
- 1. Data for single accession
- 2. Multiple datasets using a list of accessions
- 3. Extract data from already uploaded SRA dataset
-
-Below we discuss each in detail.
-
-------
-
-**Uploading data for a single accession**
-
-When you type a single accession number (e.g., `SRR1582967`) into **Accession** box and click **Execute** the tool will fetch data for you.
+This tool extracts data (in fastq_ format) from the Short Read Archive (SRA) at the National Center for Biotechnology Information (NCBI). It is based on the fasterq-dump_ utility of the SRA Toolkit.  The following applies:
 
------
-
-**Uploading multiple datasets using a list of accessions**
-
-A more realistic scenario is when you want to upload a number of datasets at once. To do this you need a list of accession, where there is only one accession per line (see below for information on how to generate such a file). Once you have this file:
+ - if data is paired-ended (or mate-pair) the tool will generate a collection of file pairs, in which each element will be a pair of fastq_ files containing forward and reverse mates.
+ - if data is single ended, each element of the collection will be a single fastq_ dataset.
 
- 1. Upload it into your history using Galaxy's upload tool
- 2. Once the list of accessions is uploaded choose *List of SRA accessions, one per line* from **select input type** dropdown
- 3. Choose uploaded file within the **sra accession list** field
- 4. Click **Execute**
 
------
-
-**Extract data from already uploaded SRA dataset**
-
-If a SRA dataset is present in the history, it can be converted into fastq dataset by setting **select input type** drop-down to *SRA archive in current history*. Just like in the case of extracting data for single accession number the following applies:
-
- - if data is paired-ended (or mate-pair) the tool will generate a single *interleaved* dataset, in which forward and reverse mates are alternating (see example below).
- - if data is single ended, a standard fastq dataset will be produced
+@HOW_TO_USE_IT@
 
 -----
 
 **Output**
 
-In every case, fastq datasets produced will be saved in Galaxy's history as a collection_ - a single history element containing multiple datasets.
-In fact, three collections will be produced: one containing paired-end data, another containing single-end data, and a third one which contains reads which could not be classified.
-Some collections may be empty if the accessions provided in the list does not contain one of the type of data.
+In every case, fastq datasets produced will be saved in Galaxy's history as a collection_ - a single history element containing multiple datasets. In fact, regardless of the experimental design, three collections will be produced: one containing paired-end data, another containing single-end data, and a third one which contains reads which could not be classified.
+Some collections may be empty if the accessions provided in the list do not contain one of the type of data.
 
 .. class:: warningmark
 
@@ -236,7 +212,7 @@
 .. class:: warningmark
 
 By default, only biological reads are dumped and in case of PAIRED dataset only the spots which have both reads will be in the paired-end collection. The remaining single reads will be in the other colletion.
-To keep all reads, and maybe do not have the same number of reads in forward and reverse use the --split-files option in Advanced Options, Select how to split the spots.
+To keep all reads, and potentially not have the same number of reads in forward and reverse use the --split-files option in Advanced Options, Select how to split the spots.
 
 @ACCESSION_LIST_HOWTO@
 
@@ -244,14 +220,12 @@
 
 
 .. _fastq: https://en.wikipedia.org/wiki/FASTQ_format
-.. _fastq-dump: https://trace.ncbi.nlm.nih.gov/Traces/sra/sra.cgi?view=toolkit_doc&f=fastq-dump
 .. _fasterq-dump: https://github.com/ncbi/sra-tools/wiki/HowTo:-fasterq-dump
 .. _collection: https://galaxyproject.org/tutorials/collections/
-.. _link: https://trace.ncbi.nlm.nih.gov/Traces/sra/sra.cgi?view=studies
+.. _link: https://trace.ncbi.nlm.nih.gov/Traces/index.html?view=run_browser&display=reads
 
 @SRATOOLS_ATTRRIBUTION@
-
 ]]>
     </help>
     <expand macro="citation"/>
-  </tool>
+</tool>
diff -r 83c7d564b128 -r 9a776b080193 fastq_dump.xml
--- a/fastq_dump.xml	Fri Sep 03 16:17:53 2021 +0000
+++ b/fastq_dump.xml	Sun Jan 22 17:51:50 2023 +0000
@@ -1,16 +1,17 @@
-<tool id="fastq_dump" name="Download and Extract Reads in FASTA/Q" version="@VERSION@+galaxy0" profile="18.01">
+<tool id="fastq_dump" name="Download and Extract Reads in FASTQ" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="@PROFILE@">
     <description>format from NCBI SRA</description>
-    <expand macro="bio_tools"/>
     <macros>
-        <import>sra_macros.xml</import>
+        <import>macros.xml</import>
     </macros>
+    <expand macro="edam_ontology"/>
+    <expand macro="bio_tools"/>
     <expand macro="requirements"/>
-    <version_command>fastq-dump --version</version_command>
+    <version_command>fastq-dump --version | tr -d $'\n'</version_command>
     <command detect_errors="exit_code"><![CDATA[
     @COPY_CONFIGFILE@
     @SET_ACCESSIONS@
 
-    #if $input.input_select == "file":
+    #if $input.input_select == "sra_file":
         fastq-dump --log-level fatal --accession '${input.file.name}'
     #else:
         ## Do not use prefetch if region is specified, to avoid downloading
@@ -64,38 +65,21 @@
     #if str($adv.table) != "":
         --table $adv.table
     #end if
-
-
-    #if $input.input_select=="file":
-        --stdout
-        "$input.file" > "$output_file"
+    ;
     
-    #elif $input.input_select=="accession_number":
-        --stdout
-        "\$acc" > "$output_accession" )
+    mkdir -p output &&
+    data=(\$(ls ./*.fast*));
+    if [ \${\#data[@]} -eq 2 ]; then
+        mv "\${data[0]}" output/"\${data[0]}"_forward.$outputformat;
+        mv "\${data[1]}" output/"\${data[1]}"_reverse.$outputformat;
+    elif [ \${\#data[@]} -eq 1 ]; then
+        mv "\${data[0]}" output/"\${data[0]}"__single.$outputformat;
+    fi;
+    
+    #if $input.input_select != "sra_file":
+        ); done;
     #end if
-
-    #if $input.input_select=="file_list":
-        "\$acc"
-        ) ; done
-
-        ;
-
-        for i in `ls *.fast* | cut -f 1 -d '_' | uniq` ; do
-            count=`ls \$i* | wc -l` ;
-            data=(\$(ls -d \$i*));
-      
-            if [ "\$count" -eq 2 ]; then
-                mv "\${data[0]}" "\${data[0]}"_forward.$outputformat;  mv "\${data[1]}" "\${data[1]}"_reverse.$outputformat ;
-            elif [ "\$count" -eq 1 ]; then
-                 mv "\${data[0]}" "\${data[0]}"__single.$outputformat ;
-            fi;
-        done
-
-
-    #end if
-
-
+    echo "Done with all accessions."
     ]]>
     </command>
     <expand macro="configfile_hack"/>
@@ -122,227 +106,165 @@
                 <option value="redacted">redacted</option>
             </param>
             <param name="spotgroups" type="text" label="Filter by spot-groups" optional="true" argument="--spot-groups"/>
-            <param name="clip" type="boolean" truevalue="--clip" falsevalue="" argument="--clip" label="Apply left and right clips" />
-            <param name="skip_technical" type="boolean" truevalue="--skip-technical" falsevalue="" checked="False" label="Dump only biological reads" argument="--skip-technical"/>
-            <param name="table" label="Table name within cSRA object" type="text" value="" optional="true" help="For SRA of noisy long-reads put SEQUENCE" argument="--table"/>
+            <param type="boolean" truevalue="--clip" falsevalue="" argument="--clip" label="Apply left and right clips" />
+            <param type="boolean" truevalue="--skip-technical" falsevalue="" checked="False" label="Dump only biological reads" argument="--skip-technical"/>
+            <param label="Table name within cSRA object" type="text" value="" optional="true" help="For SRA of noisy long-reads put SEQUENCE" argument="--table"/>
         </section>
     </inputs>
     <outputs>
-        <collection name="list_paired" type="list:paired" label="Pair-end data (fastq-dump)">
-            <filter>input['input_select'] == "file_list"</filter>
-
+        <collection name="list_paired" type="list:paired" label="Paired-end data (fastq-dump)">
         <!-- Use named regex group to grab pattern
              <identifier_0>_<identifier_1>.fq. Here identifier_0 is the list
              identifier in the nested collection and identifier_1 is either
              forward or reverse (for instance samp1_forward.fq).
         -->
-        
-            <discover_datasets pattern="(?P&lt;identifier_0&gt;[^_]+)_\d+.fastq_(?P&lt;identifier_1&gt;[^_]+)\.fastqsanger" ext="fastqsanger" />
-            <discover_datasets pattern="(?P&lt;identifier_0&gt;[^_]+)_\d+.fastq.gz_(?P&lt;identifier_1&gt;[^_]+)\.fastqsanger.gz" ext="fastqsanger.gz" />
-            <discover_datasets pattern="(?P&lt;identifier_0&gt;[^_]+)_\d+.fastq.bz2_(?P&lt;identifier_1&gt;[^_]+)\.fastqsanger.bz2" ext="fastqsanger.bz2" />
-        </collection>
-        <collection name="output_collection" type='list' label="Single-end data (fastq-dump)">
-            <filter>input['input_select'] == "file_list"</filter>
-            <discover_datasets pattern="(?P&lt;designation&gt;.+)_\d+.fastq__single\.fastqsanger" directory="." ext='fastqsanger'/>
-            <discover_datasets pattern="(?P&lt;designation&gt;.+)_\d+.fastq.gz__single\.fastqsanger.gz" directory="." ext='fastqsanger.gz'/>
-            <discover_datasets pattern="(?P&lt;designation&gt;.+)_\d+.fastq.bz2__single\.fastqsanger.bz2" directory="." ext='fastqsanger.bz2'/>
+            <discover_datasets pattern="(?P&lt;identifier_0&gt;[^_]+)_\d+.fastq_(?P&lt;identifier_1&gt;[^_]+)\.fastqsanger" ext="fastqsanger" directory="output"/>
+            <discover_datasets pattern="(?P&lt;identifier_0&gt;[^_]+)_\d+.fastq.gz_(?P&lt;identifier_1&gt;[^_]+)\.fastqsanger.gz" ext="fastqsanger.gz" directory="output"/>
+            <discover_datasets pattern="(?P&lt;identifier_0&gt;[^_]+)_\d+.fastq.bz2_(?P&lt;identifier_1&gt;[^_]+)\.fastqsanger.bz2" ext="fastqsanger.bz2" directory="output"/>
         </collection>
-        <data format="fastqsanger" name="output_accession" label="${input.accession} (fastq-dump)">
-            <filter>input['input_select'] == "accession_number"</filter>
-            <change_format>
-                <when input="outputformat" value="fastqsanger.gz" format="fastqsanger.gz"/>
-                <when input="outputformat" value="fastqsanger.bz2" format="fastqsanger.bz2"/>
-            </change_format>
-        </data>
-        <data format="fastqsanger" name="output_file" label="${input.file.name} (fastq-dump)">
-            <filter>input['input_select'] == "file"</filter>
-            <change_format>
-                <when input="outputformat" value="fastqsanger.gz" format="fastqsanger.gz"/>
-                <when input="outputformat" value="fastqsanger.bz2" format="fastqsanger.bz2"/>
-            </change_format>
-        </data>
+        <collection name="list_single" type='list' label="Single-end data (fastq-dump)">
+            <discover_datasets pattern="(?P&lt;designation&gt;.+)_\d+.fastq__single\.fastqsanger" directory="output" ext='fastqsanger'/>
+            <discover_datasets pattern="(?P&lt;designation&gt;.+)_\d+.fastq.gz__single\.fastqsanger.gz" directory="output" ext='fastqsanger.gz'/>
+            <discover_datasets pattern="(?P&lt;designation&gt;.+)_\d+.fastq.bz2__single\.fastqsanger.bz2" directory="output" ext='fastqsanger.bz2'/>
+        </collection>
     </outputs>
     <tests>
-        <test>
+        <test expect_num_outputs="2">
             <param name="input_select" value="accession_number"/>
             <param name="outputformat" value="fastqsanger"/>
             <param name="accession" value="SRR044777"/>
             <param name="skip_technical" value="True"/>
-            <output name="output_accession">
-                <assert_contents>
-                    <not_has_text text="rRNA_primer"/>
-                    <has_text text="F47USSH02GNP1D" />
-                </assert_contents>
-            </output>
+            <output_collection name="list_single" type="list" count="1">
+                <element name="SRR044777">
+                    <assert_contents>
+                        <not_has_text text="rRNA_primer"/>
+                        <has_text text="F47USSH02GNP1D"/>
+                    </assert_contents>
+                </element>
+            </output_collection>
         </test>
-        <test>
+        <test expect_num_outputs="2">
             <param name="input_select" value="accession_number"/>
             <param name="outputformat" value="fastqsanger.gz"/>
             <param name="accession" value="SRR925743"/>
             <param name="maxID" value="5"/>
-            <output name="output_accession" file="fastq_dump_result.fastq.gz" decompress="True"/>
+            <output_collection name="list_paired" type="list:paired" count="1">
+                <element name="SRR925743">
+                    <element name="forward" file="SRR925743_forward.fastqsanger" decompress="True"/>
+                    <element name="reverse" file="SRR925743_reverse.fastqsanger" decompress="True"/>
+                </element>
+            </output_collection>
         </test>
-        <test>
+        <test expect_num_outputs="2">
             <param name="input_select" value="accession_number"/>
             <param name="outputformat" value="fastqsanger"/>
             <param name="accession" value="SRR925743"/>
             <param name="maxID" value="5"/>
-            <output name="output_accession" file="fastq_dump_result.fastq" ftype="fastqsanger"/>
+            <output_collection name="list_paired" type="list:paired" count="1">
+                <element name="SRR925743">
+                    <element name="forward" file="SRR925743_forward.fastqsanger"/>
+                    <element name="reverse" file="SRR925743_reverse.fastqsanger"/>
+                </element>
+            </output_collection>
         </test>
-        <test>
+        <test expect_num_outputs="2">
             <param name="input_select" value="file_list"/>
             <param name="outputformat" value="fastqsanger"/>
             <param name="file_list" value="list_pe"/>
             <param name="maxID" value="5"/>
-            <output_collection name="list_paired" type="list:paired">
+            <output_collection name="list_paired" type="list:paired" count="1">
                 <element name="DRR015708">
-                    <element name="forward" file="DRR015708_forward.fastqsanger">
-                    </element>
-                    <element name="reverse" file="DRR015708_reverse.fastqsanger">
-                    </element>
+                    <element name="forward" file="DRR015708_forward.fastqsanger"/>
+                    <element name="reverse" file="DRR015708_reverse.fastqsanger"/>
                 </element>
             </output_collection>
         </test>
-        <test>
+        <test expect_num_outputs="2">
             <param name="input_select" value="file_list"/>
             <param name="outputformat" value="fastqsanger"/>
             <param name="file_list" value="list_pe2"/>
             <param name="maxID" value="5"/>
-            <output_collection name="list_paired" type="list:paired">
+            <output_collection name="list_paired" type="list:paired" count="1">
                 <element name="ERR027433">
-                    <element name="forward" file="ERR027433_forward.fastqsanger">
-                    </element>
-                    <element name="reverse" file="ERR027433_reverse.fastqsanger">
-                    </element>
+                    <element name="forward" file="ERR027433_forward.fastqsanger"/>
+                    <element name="reverse" file="ERR027433_reverse.fastqsanger"/>
                 </element>
             </output_collection>
         </test>      
-        <test>
+        <test expect_num_outputs="2">
             <param name="input_select" value="file_list"/>
             <param name="outputformat" value="fastqsanger"/>
             <param name="file_list" value="list_se"/>
             <param name="maxID" value="5"/>
-            <output_collection name="output_collection" type="list">
+            <output_collection name="list_single" type="list" count="1">
                 <element name="SRR1993644" file="SRR1993644.fastqsanger"/>
             </output_collection>
         </test>
-        <test>
+        <test expect_num_outputs="2">
             <param name="input_select" value="accession_number"/>
             <param name="outputformat" value="fastqsanger.gz"/>
             <param name="accession" value="SRR6982805"/>
             <param name="maxID" value="2"/>
             <param name="table" value="SEQUENCE"/>
-            <output name="output_accession" file="SRR6982805.fastqsanger.gz" ftype="fastqsanger.gz" decompress="True"/>
-        </test>  
+            <output_collection name="list_single" type="list" count="1">
+                <element name="SRR6982805" file="SRR6982805.fastqsanger.gz" ftype="fastqsanger.gz" decompress="True"/>
+            </output_collection>
+        </test>
+        <test expect_num_outputs="2">
+            <param name="input_select" value="accession_number"/>
+            <param name="outputformat" value="fastqsanger.gz"/>
+            <param name="accession" value="ERR086330, SRR11953971"/>
+            <output_collection name="list_paired" type="list:paired" count="2">
+                <element name="ERR086330">
+                    <element name="forward" file="ERR086330_1.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
+                    <element name="reverse" file="ERR086330_2.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
+                </element>
+                <element name="SRR11953971">
+                    <element name="forward" file="SRR11953971_1.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
+                    <element name="reverse" file="SRR11953971_2.fastq.gz" ftype="fastqsanger.gz" decompress="True"/>
+                </element>
+            </output_collection>
+        </test>
     </tests>
     <help><![CDATA[
 **What it does?**
 
-This tool extracts data (in fastq_ format) from the Short Read Archive (SRA) at the National Center for Biotechnology Information (NCBI). It is based on the fastq-dump_ utility of the SRA Toolkit.
-
-**How to use it?**
-
-There are three ways in which you can download data:
-
- 1. Data for single accession
- 2. Multiple datasets using a list of accessions
- 3. Extract data from already uploaded SRA dataset
+This tool extracts data (in fastq_ format) from the Short Read Archive (SRA) at the National Center for Biotechnology Information (NCBI). It is based on the fasterq-dump_ utility of the SRA Toolkit.  The following applies:
 
-Below we discuss each in detail.
-
-------
+ - if data is paired-ended (or mate-pair) the tool will generate a collection of file pairs, in which each element will be a pair of fastq_ files containing forward and reverse mates.
+ - if data is single ended, each element of the collection will be a single fastq_ dataset.
 
-**Uploading data for a single accession**
 
-When you type a single accession number (e.g., `SRR1582967`) into **Accession** box and click **Execute** the tool will fetch data for you. It is important to keep the following in mind:
-
- - if data is paired-ended (or mate-paired) the tool will generate a single *interleaved* dataset, in which forward and reverse mates are alternating (see an example dataset below)
- - if data is single ended, a standard single fastq dataset will be produced
+@HOW_TO_USE_IT@
 
 -----
 
-**Uploading multiple datasets using a list of accessions**
-
-A more realistic scenario is when you want to upload a number of datasets at once. To do this you need a list of accession, where there is only one accession per line (see below for information on how to generate such a file). Once you have this file:
+**Output**
 
- 1. Upload it into your history using Galaxy's upload tool
- 2. Once the list of accessions is uploaded choose *List of SRA accessions, one per line* from **select input type** dropdown
- 3. Choose uploaded file within the **sra accession list** field
- 4. Click **Execute**
+In every case, fastq datasets produced will be saved in Galaxy's history as a collection_ - a single history element containing multiple datasets. In fact, regardless of the experimental design, three collections will be produced: one containing paired-end data, another containing single-end data, and a third one which contains reads which could not be classified.
+Some collections may be empty if the accessions provided in the list do not contain one of the type of data.
 
 .. class:: warningmark
 
-Fastq datasets produced by this option will be saved in Galaxy's history as a collection_ - a single history element containing multiple datasets. In fact, two collections will be produced: one containing paired-end data and another containing single-end data. Single-end or pair-end collections may be empty if the accessions provided in the list contain only SINGLE or PAIRED data, respectively.
-
------
+When you decide to dump technical reads (in Advanced Options Dump only biological reads is set to No), you will probably find your PAIRED data in the other data collection as it is impossible to determine if it was 2 biological reads or one biological and one technical.
 
-**Extract data from already uploaded SRA dataset**
+.. class:: warningmark
 
-If a SRA dataset is present in the history, it can be converted into fastq dataset by setting **select input type** drop-down to *SRA archive in current history*. Just like in the case of extracting data for single accession number the following applies:
-
- - if data is paired-ended (or mate-pair) the tool will generate a single *interleaved* dataset, in which forward and reverse mates are alternating (see example below).
- - if data is single ended, a standard fastq dataset will be produced
+By default, only biological reads are dumped and in case of PAIRED dataset only the spots which have both reads will be in the paired-end collection. The remaining single reads will be in the other colletion.
+To keep all reads, and potentially not have the same number of reads in forward and reverse use the --split-files option in Advanced Options, Select how to split the spots.
 
 @ACCESSION_LIST_HOWTO@
 
 -----
 
-**Paired-end (and mate-pair) data in fastq format**
-
-Paired end datasets can be represented as two individual datasets:
-
-First dataset::
-
- @1/1
- AGGGATGTGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTA
- +
- EGGEGGGDFGEEEAEECGDEGGFEEGEFGBEEDDECFEFDD@CDD<ED
- @2/1
- AGGGATGTGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTA
- +
- HHHHHHEGFHEEFEEHEEHHGGEGGGGEFGFGGGGHHHHFBEEEEEFG
-
-Second dataset::
-
- @1/2
- CCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAAC
- +
- GHHHDFDFGFGEGFBGEGGEGEGGGHGFGHFHFHHHHHHHEF?EFEFF
- @2/2
- CCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAAC
- +
- HHHHHHHHHHHHHGHHHHHHGHHHHHHHHHHHFHHHFHHHHHHHHHHH
-
-Or a single *interleaved* dataset::
-
- @1/1
- AGGGATGTGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTA
- +
- EGGEGGGDFGEEEAEECGDEGGFEEGEFGBEEDDECFEFDD@CDD<ED
- @1/2
- CCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAAC
- +
- GHHHDFDFGFGEGFBGEGGEGEGGGHGFGHFHFHHHHHHHEF?EFEFF
- @2/1
- AGGGATGTGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTA
- +
- HHHHHHEGFHEEFEEHEEHHGGEGGGGEFGFGGGGHHHHFBEEEEEFG
- @2/2
- CCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAAC
- +
- HHHHHHHHHHHHHGHHHHHHGHHHHHHHHHHHFHHHFHHHHHHHHHHH
-
-----
-
 
 .. _fastq: https://en.wikipedia.org/wiki/FASTQ_format
-.. _fastq-dump: https://trace.ncbi.nlm.nih.gov/Traces/sra/sra.cgi?view=toolkit_doc&f=fastq-dump
+.. _fasterq-dump: https://github.com/ncbi/sra-tools/wiki/HowTo:-fasterq-dump
 .. _collection: https://galaxyproject.org/tutorials/collections/
-.. _link: https://trace.ncbi.nlm.nih.gov/Traces/sra/sra.cgi?view=studies
+.. _link: https://trace.ncbi.nlm.nih.gov/Traces/index.html?view=run_browser&display=reads
 
 @SRATOOLS_ATTRRIBUTION@
-
 ]]>
     </help>
     <expand macro="citation"/>
-  </tool>
+</tool>
diff -r 83c7d564b128 -r 9a776b080193 macros.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/macros.xml	Sun Jan 22 17:51:50 2023 +0000
@@ -0,0 +1,188 @@
+<macros>
+    <token name="@TOOL_VERSION@">3.0.0</token>
+    <token name="@VERSION_SUFFIX@">0</token>
+    <token name="@PROFILE@">22.01</token>
+    <xml name="edam_ontology">
+        <edam_topics>
+            <edam_topic>topic_0622</edam_topic> <!-- Genomics -->
+            <edam_topic>topic_0091</edam_topic> <!-- Bioinformatics -->
+        </edam_topics>
+        <edam_operations>
+            <edam_operation>operation_2422</edam_operation> <!-- Data retrieval -->
+            <edam_operation>operation_0335</edam_operation> <!-- Formatting -->
+        </edam_operations>
+    </xml>
+    <macro name="requirements">
+        <requirements>
+            <requirement type="package" version="@TOOL_VERSION@">sra-tools</requirement>
+            <requirement type="package" version="2.6">pigz</requirement>
+            <requirement type="package" version="1.16.1">samtools</requirement>
+            <yield/>
+        </requirements>
+    </macro>
+    <token name="@ACCESSIONS_FROM_FILE@">
+        grep '^[[:space:]]*[E|S|D]RR[0-9]\{1,\}[[:space:]]*$'
+    </token>
+    <token name="@COMPRESS@"><![CDATA[pigz -cqp \${GALAXY_SLOTS:-1}]]></token>
+    <token name="@CONFIGURE_RETRY@"><![CDATA[
+        export SRA_PREFETCH_RETRIES=3 &&
+        export SRA_PREFETCH_ATTEMPT=1 &&
+    ]]></token>
+    <xml name="bio_tools">
+        <xrefs>
+            <xref type="bio.tools">sra-tools</xref>
+        </xrefs>
+    </xml>
+    <token name="@COPY_CONFIGFILE@"><![CDATA[
+        mkdir -p ~/.ncbi &&
+        cp '$user_settings_mkfg' ~/.ncbi/user-settings.mkfg &&
+        vdb-config -s "/repository/user/main/public/root=\$PWD" &&
+        vdb-config -s "/repository/user/ad/public/root=\$PWD" &&
+        vdb-config -s "/repository/user/default-path=\$PWD" &&
+        vdb-config -s "/repository/user/main/public/root=\$PWD" &&
+        vdb-config -s /http/timeout/read=10000 &&
+    ]]></token>
+    <token name="@SET_ACCESSIONS@"><![CDATA[
+        #if $input.input_select == "sra_file":
+            acc='${input.sra_file.name}' &&
+            ln -s '${input.sra_file}' "\$acc" &&
+        #else    
+            #if $input.input_select == "file_list":
+                #if $input.file_list.is_of_type('sra_manifest.tabular'):
+                    #set $column = $input.file_list.unsanitized.metadata.column_names.index('Run') + 1
+                    cut -f $column '$input.file_list'| tail -n +2 > accessions &&
+                #else
+                    @ACCESSIONS_FROM_FILE@ '$input.file_list' > accessions &&
+                #end if
+            #elif $input.input_select == "accession_number":
+                echo '${input.accession}' | sed -r 's/(\,|\;|__cn__)/\n/g' > accessions &&
+            #end if
+            for acc in \$(cat ./accessions);
+            do (
+                echo "Downloading accession: \$acc..." &&
+        #end if  
+    ]]></token>
+    <macro name="configfile_hack">
+        <configfiles>
+            <configfile name="user_settings_mkfg"><![CDATA[
+/LIBS/GUID = "3cdc38d0-711a-49ce-9536-f544eaf69eec"
+/config/default = "false"
+/libs/temp_cache = "."
+/tools/prefetch/download_to_cache = "false"
+            ]]></configfile>
+        </configfiles>
+    </macro>
+    <macro name="sanitize_query">
+        <sanitizer>
+            <valid initial="string.printable">
+                <remove value=" "/>
+                <remove value="&apos;" />
+            </valid>
+            <mapping initial="none">
+                <add source=" " target=""/>
+                <add source="&apos;" target="&apos;&quot;&apos;&quot;&apos;"/>
+            </mapping>
+        </sanitizer>
+    </macro>
+    <macro name="input_conditional">
+        <conditional name="input">
+            <param name="input_select" type="select" label="select input type">
+                <option value="accession_number">SRR accession</option>
+                <option value="file_list">List of SRA accession, one per line</option>
+                <option value="sra_file">SRA archive in current history</option>
+            </param>
+            <when value="accession_number">
+                <param name="accession" type="text" label="Accession" multiple="true" help="Must start with SRR, DRR or ERR, e.g. SRR925743, ERR343809">
+                    <expand macro="sanitize_query"/>
+                    <validator type="empty_field" message="An accession is required"/>
+                </param>
+            </when>
+            <when value="sra_file">
+                <param format="sra" name="sra_file" type="data" label="sra archive"/>
+            </when>
+            <when value="file_list">
+                <param format="txt" name="file_list" type="data" label="sra accession list"/>
+            </when>
+        </conditional>
+    </macro>
+    <macro name="alignments">
+        <param name="alignments" type="select" value="both" label="Output aligned or unaligned reads" help="Output reads according to their alignment status." argument="--aligned and --unaligned">
+            <option value="both">both</option>
+            <option value="aligned">aligned only</option>
+            <option value="unaligned">unaligned only</option>
+        </param>
+    </macro>
+    <macro name="minMapq">
+        <param name="minMapq" type="integer" min="0" max="42" label="Minimum mapping quality" optional="true" help="Minimum mapping quality an alignment has to have, to be dumped." argument="--min-mapq"/>
+    </macro>
+    <macro name="region">
+        <param format="text" name="region" type="text" label="aligned region" optional="true"
+               help="Filter by position on genome. Can be either accession.version (ex: NC_000001.10), chromosome name (ex:chr1 or 1) or 1-based coordinates (ex: chr1:1-101)." argument="--aligned-region"/>
+    </macro>
+    <macro name="matepairDist">
+        <param name="matepairDist" type="text" label="mate-pair distance (from-to|unknown)" optional="true"
+               help="Filter by distance between matepairs. Use unknown to find matepairs split between the references. Use from-to (inclusive) to limit matepair distance on the same reference" argument="--matepair-distance"/>
+    </macro>
+    <macro name="citation">
+        <citations>
+            <citation type="doi">10.1093/nar/gkq1019</citation>
+            <citation type="bibtex">
+@misc{github_sratools,
+  author = {NCBI},
+  title = {sra-tools},
+  publisher = {GitHub},
+  journal = {GitHub repository},
+  url = {https://github.com/ncbi/sra-tools},
+}</citation>
+        </citations>
+    </macro>
+    <token name="@HOW_TO_USE_IT@">
+    **How to use it?**
+
+There are three ways in which you can download data:
+
+ 1. Plain text input of accession number(s)
+ 2. Providing a list of accessions from file
+ 3. Extracting data from an already uploaded SRA dataset
+
+Below we discuss each in detail.
+
+------
+
+**Plain text input of accession number(s)**
+
+When you type an accession number (e.g., `SRR1582967`) into **Accession** box and click **Execute** the tool will fetch the data for you. You can also provide a list of multiple accession numbers (e.g. `SRR3141592, SRR271828, SRR112358`).
+
+-----
+
+**Providing a list of accessions from file**
+
+A more realistic scenario is when you want to upload a number of datasets at once. To do this you need a list of accession, where there is only one accession per line (see below for information on how to generate such a file). Once you have this file:
+
+ 1. Upload it into your history using Galaxy's upload tool
+ 2. Once the list of accessions is uploaded choose *List of SRA accessions, one per line* from **select input type** dropdown
+ 3. Choose uploaded file within the **sra accession list** field
+ 4. Click **Execute**
+
+-----
+
+**Extract data from an already uploaded SRA dataset**
+
+If an SRA dataset is already present in the history, the sequencing data can be extracted in a human-readable data format (fastq, sam, bam) by setting **select input type** drop-down to *SRA archive in current history*.
+    </token>
+    <token name="@ACCESSION_LIST_HOWTO@">
+-----
+
+**How to generate accession lists**
+
+ 1. Go to **SRA Run Selector** by clicking this link_
+ 2. Find the study you are interested in by typing a search term within the **Search** box. This can be a word (e.g., *mitochondria*) or an accession you have gotten from a paper (e.g., *SRR1582967*).
+ 3. Once you click on the study of interest you will see the number of datasets in this study within the **Related SRA data** box
+ 4. Click on the Runs number
+ 5. On the page that would open you will see **Accession List** button
+ 6. Clicking of this button will produce a file that you will need to upload into Galaxy and use as the input to this tool.
+    </token>
+    <token name="@SRATOOLS_ATTRRIBUTION@">
+For credits, information, support and bug reports, please refer ato https://github.com/galaxyproject/tools-iuc.
+    </token>
+</macros>
diff -r 83c7d564b128 -r 9a776b080193 sam_dump.xml
--- a/sam_dump.xml	Fri Sep 03 16:17:53 2021 +0000
+++ b/sam_dump.xml	Sun Jan 22 17:51:50 2023 +0000
@@ -1,23 +1,21 @@
-<tool id="sam_dump" name="Download and Extract Reads in BAM" version="@VERSION@+galaxy0" profile="18.01">
+<tool id="sam_dump" name="Download and Extract Reads in BAM" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="@PROFILE@">
     <description>format from NCBI SRA</description>
-    <expand macro="bio_tools"/>
     <macros>
-        <import>sra_macros.xml</import>
+        <import>macros.xml</import>
     </macros>
-    <expand macro="requirements">
-        <requirement type="package" version="1.10">samtools</requirement>
-    </expand>
-    <version_command>sam-dump --version</version_command>
-    <command detect_errors="exit_code">
-<![CDATA[
+    <expand macro="edam_ontology"/>
+    <expand macro="bio_tools"/>
+    <expand macro="requirements"/>
+    <version_command>sam-dump --version | tr -d $'\n'</version_command>
+    <command detect_errors="exit_code"><![CDATA[
         @COPY_CONFIGFILE@
         @SET_ACCESSIONS@
 
         ## Do not use prefetch if region is specified, to avoid downloading
         ## the complete sra file.
 
-        #if $input.input_select == "file":
-            sam-dump --log-level fatal  '${input.file.name}'
+        #if $input.input_select == "sra_file":
+            sam-dump --log-level fatal  --accession '\$acc'
         #else:
             #if ( str( $adv.region ) == "" ):
                 prefetch -X 200000000 "\$acc" &&
@@ -45,32 +43,18 @@
         #if (str( $adv.primary ) == "yes") and (str ( $adv.alignments != "unaligned") ):
             --primary
         #end if
-        #if $input.input_select == "file":
-            '$input.file'
-        #elif $input.input_select == "accession_number":
-            "\$acc"
-        #elif $input.input_select=="file_list":
-            "\$acc"
-        #end if
+        "\$acc"
 
         #if str( $outputformat ) == "bam":
-            | samtools view -Sb - 2> /dev/null
-        #end if
-        #if $input.input_select == "file":
-            > '$output_file'
-        #elif $input.input_select == "accession_number":
-            > '$output_accession' )
+            | samtools view -Sb - 2> /dev/null > "\$acc.bam"
+        #elif str( $outputformat ) == "sam":
+            > "\$acc.sam"
         #end if
-
-        #if $input.input_select=="file_list":
-                 #if str( $outputformat ) == "bam":
-                      > "\$acc.bam"
-                 #elif str( $outputformat ) == "sam":
-                      > "\$acc.sam"
-                 #end if
-        ) ; done
+        
+        #if $input.input_select != "sra_file":
+            ); done;
         #end if
-
+        echo "Done with all accessions."
         ]]>
     </command>
     <expand macro="configfile_hack"/>
@@ -93,23 +77,10 @@
         </section>
     </inputs>
     <outputs>
-        <collection name="output_collection" type="list" label="SAM/BAM data (fastq-dump)">
-          <filter>input['input_select'] == "file_list"</filter>
-          <discover_datasets pattern="(?P&lt;designation&gt;.+)\.bam" directory="." ext='bam'/>
-          <discover_datasets pattern="(?P&lt;designation&gt;.+)\.sam" directory="." ext='sam'/>
+        <collection name="output_collection" type="list" label="sam-dump: Downloaded SAM/BAM data">
+            <discover_datasets pattern="(?P&lt;designation&gt;.+)\.bam" directory="." ext='bam'/>
+            <discover_datasets pattern="(?P&lt;designation&gt;.+)\.sam" directory="." ext='sam'/>
         </collection>
-        <data name="output_accession" format="bam" label="${input.accession} (sam-dump)">
-            <filter>input['input_select'] == "accession_number"</filter>
-            <change_format>
-                <when input="outputformat" value="sam" format="sam"/>
-            </change_format>
-        </data>
-        <data name="output_file" format="bam" label="${input.file.name} (sam-dump)">
-            <filter>input['input_select'] == "file"</filter>
-            <change_format>
-                <when input="outputformat" value="sam" format="sam"/>
-            </change_format>
-        </data>
     </outputs>
     <tests>
         <test>
@@ -117,60 +88,38 @@
             <param name="accession" value="SRR925743"/>
             <param name="outputformat" value="sam"/>
             <param name="region" value="17:41243452-41277500"/>
-            <output name="output_accession" file="sam_dump_result.sam" compare="contains" ftype="sam"/>
+            <output_collection name="output_collection" type="list" count="1">
+                <element name="SRR925743" file="SRR925743_sam_dump_result.sam" compare="contains" ftype="sam"/>
+            </output_collection>
+        </test>
+        <test>
+            <param name="input_select" value="accession_number"/>
+            <param name="accession" value="SRR925743,SRR522874"/>
+            <param name="outputformat" value="sam"/>
+            <param name="region" value="17:41243452-41277500"/>
+            <output_collection name="output_collection" type="list" count="2">
+                <element name="SRR522874" file="SRR522874_sam_dump_result.sam" compare="contains" ftype="sam"/>
+                <element name="SRR925743" file="SRR925743_sam_dump_result.sam" compare="contains" ftype="sam"/>
+            </output_collection>
         </test>
     </tests>
     <help><![CDATA[
 
 **What it does?**
 
-This tool extracts data (in BAM_ format) from the Short Read Archive (SRA) at the National Center for Biotechnology Information (NCBI). It is based on the sam-dump_ utility of the SRA Toolkit.
-
-**How to use it?**
-
-There are three ways in which you can download data:
-
- 1. Data for single accession
- 2. Multiple datasets using a list of accessions
- 3. Extract data from already uploaded SRA dataset
-
-Below we discuss each in detail.
-
-------
-
-**Uploading data for a single accession**
-
-When you type a single accession number (e.g., `SRR1582967`) into **Accession** box and click **Execute** the tool will fetch data for you. As a result you will get a single BAM (or SAM) dataset in the history.
+This tool extracts data (in BAM_ format) from the Short Read Archive (SRA) at the National Center for Biotechnology Information (NCBI). It is based on the sam-dump_ utility of the SRA Toolkit and returns a collection of NGS data containing one file for each accession number provided.
 
------
 
-**Uploading multiple datasets using a list of accessions**
-
-A more realistic scenario is when you want to upload a number of datasets at once. To do this you need a list of accession, where there is only one accession per line (see below for information on how to generate such a file). Once you have this file:
-
- 1. Upload it into your history using Galaxy's upload tool
- 2. Once the list of accessions is uploaded choose *List of SRA accessions, one per line* from **select input type** dropdown
- 3. Choose uploaded file within the **sra accession list** field
- 4. Click **Execute**
-
-.. class:: warningmark
-
-BAM datasets produced by this option will be saved in Galaxy's history as a collection_ - a single history element containing multiple datasets.
-
------
-
-**Extract data from already uploaded SRA dataset**
-
-If a SRA dataset is present in the history, it can be converted into BAM dataset by setting **select input type** drop-down to *SRA archive in current history*. Just like in the case of extracting data for single accession number a single BAM dataset will be generated in the history.
+@HOW_TO_USE_IT@
 
 @ACCESSION_LIST_HOWTO@
 
 -----
 
+.. _sam-dump: https://github.com/ncbi/sra-tools
 .. _BAM: https://samtools.github.io/hts-specs/SAMv1.pdf
-.. _sam-dump: https://trace.ncbi.nlm.nih.gov/Traces/sra/sra.cgi?view=toolkit_doc&f=sam-dump
 .. _collection: https://galaxyproject.org/tutorials/collections/
-.. _link: https://trace.ncbi.nlm.nih.gov/Traces/sra/sra.cgi?view=studies
+.. _link: https://trace.ncbi.nlm.nih.gov/Traces/index.html?view=run_browser&display=reads
 
 @SRATOOLS_ATTRRIBUTION@
     ]]></help>
diff -r 83c7d564b128 -r 9a776b080193 sra_macros.xml
--- a/sra_macros.xml	Fri Sep 03 16:17:53 2021 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-<macros>
-    <token name="@VERSION@">2.11.0</token>
-    <token name="@ACCESSIONS_FROM_FILE@">
-        grep '^[[:space:]]*[E|S|D]RR[0-9]\{1,\}[[:space:]]*$'
-    </token>
-    <token name="@COMPRESS@"><![CDATA[pigz -cqp \${GALAXY_SLOTS:-1}]]></token>
-    <token name="@CONFIGURE_RETRY@"><![CDATA[
-        export SRA_PREFETCH_RETRIES=3 &&
-        export SRA_PREFETCH_ATTEMPT=1 &&
-    ]]></token>
-    <xml name="bio_tools">
-        <xrefs>
-            <xref type="bio.tools">sra-tools</xref>
-        </xrefs>
-    </xml>
-    <token name="@COPY_CONFIGFILE@"><![CDATA[
-    mkdir -p ~/.ncbi &&
-    cp '$user_settings_mkfg' ~/.ncbi/user-settings.mkfg &&
-    vdb-config -s "/repository/user/main/public/root=\$PWD" &&
-    vdb-config -s "/repository/user/ad/public/root=\$PWD" &&
-    vdb-config -s "/repository/user/default-path=\$PWD" &&
-    vdb-config -s "/repository/user/main/public/root=\$PWD" &&
-    vdb-config -s /http/timeout/read=10000 &&
-    ]]></token>
-    <token name="@SET_ACCESSIONS@"><![CDATA[
-        #if $input.input_select=="file_list":
-            #if $input.file_list.is_of_type('sra_manifest.tabular'):
-                #set $column = $input.file_list.unsanitized.metadata.column_names.index('Run') + 1
-                cut -f $column '$input.file_list'| tail -n +2 > "manifest" &&
-            #else
-                ln -s '$input.file_list' manifest &&
-            #end if
-            for acc in `@ACCESSIONS_FROM_FILE@ manifest` ;
-            do (
-        #elif $input.input_select=="accession_number":
-            acc='${input.accession}' && [ ""\$acc" =~ ^[E|S|D]RR[0-9]{1,}$" ] && (
-        #end if
-    ]]></token>
-
-    <macro name="requirements">
-        <requirements>
-            <requirement type="package" version="@VERSION@">sra-tools</requirement>
-            <requirement type="package" version="2.5">pigz</requirement>
-            <yield/>
-        </requirements>
-    </macro>
-    <macro name="configfile_hack">
-        <configfiles>
-            <configfile name="user_settings_mkfg"><![CDATA[
-/LIBS/GUID = "3cdc38d0-711a-49ce-9536-f544eaf69eec"
-/config/default = "false"
-/libs/temp_cache = "."
-/tools/prefetch/download_to_cache = "false"
-            ]]></configfile>
-        </configfiles>
-    </macro>
-    <macro name="sanitize_query">
-        <sanitizer>
-            <valid initial="string.printable">
-                <remove value=" "/>
-                <remove value="&apos;" />
-            </valid>
-            <mapping initial="none">
-                <add source=" " target=""/>
-                <add source="&apos;" target="&apos;&quot;&apos;&quot;&apos;" />
-            </mapping>
-        </sanitizer>
-    </macro>
-    <macro name="input_conditional">
-        <conditional name="input">
-            <param name="input_select" type="select" label="select input type">
-                <option value="accession_number">SRR accession</option>
-                <option value="file_list">List of SRA accession, one per line</option>
-                <option value="file">SRA archive in current history</option>
-            </param>
-            <when value="accession_number">
-                <param name="accession" type="text" label="Accession" help="Must start with SRR, DRR or ERR, e.g. SRR925743, ERR343809">
-                    <expand macro="sanitize_query" />
-                    <validator type="empty_field" message="An accession is required"/>
-                </param>
-            </when>
-            <when value="file">
-                <param format="sra" name="file" type="data" label="sra archive"/>
-            </when>
-            <when value="file_list">
-                <param format="txt" name="file_list" type="data" label="sra accession list"/>
-            </when>
-        </conditional>
-    </macro>
-    <macro name="alignments">
-        <param name="alignments" type="select" value="both" label="Output aligned or unaligned reads" help="Output reads according to their alignment status." argument="--aligned and --unaligned">
-            <option value="both">both</option>
-            <option value="aligned">aligned only</option>
-            <option value="unaligned">unaligned only</option>
-        </param>
-    </macro>
-    <macro name="minMapq">
-        <param name="minMapq" type="integer" min="0" max="42" label="Minimum mapping quality" optional="true" help="Minimum mapping quality an alignment has to have, to be dumped." argument="--min-mapq"/>
-    </macro>
-    <macro name="region">
-        <param format="text" name="region" type="text" label="aligned region" optional="true"
-               help="Filter by position on genome. Can be either accession.version (ex: NC_000001.10), chromosome name (ex:chr1 or 1) or 1-based coordinates (ex: chr1:1-101)." argument="--aligned-region"/>
-    </macro>
-    <macro name="matepairDist">
-        <param name="matepairDist" type="text" label="mate-pair distance (from-to|unknown)" optional="true"
-               help="Filter by distance between matepairs. Use unknown to find matepairs split between the references. Use from-to (inclusive) to limit matepair distance on the same reference" argument="--matepair-distance"/>
-    </macro>
-    <macro name="citation">
-        <citations>
-            <citation type="doi">10.1093/nar/gkq1019</citation>
-        </citations>
-    </macro>
-    <token name="@ACCESSION_LIST_HOWTO@">
------
-
-**How to generate accession lists**
-
- 1. Go to **SRA Run Selector** by clicking this link_
- 2. Find the study you are interested in by typing a search term within the **Search** box. This can be a word (e.g., *mitochondria*) or an accession you have gotten from a paper (e.g., *SRR1582967*).
- 3. Once you click on the study of interest you will see the number of datasets in this study within the **Related SRA data** box
- 4. Click on the Runs number
- 5. On the page that would open you will see **Accession List** button
- 6. Clicking of this button will produce a file that you will need to upload into Galaxy and use as the input to this tool.
-    </token>
-
-    <token name="@SRATOOLS_ATTRRIBUTION@">
-Galaxy tool wrapper originally written by Matt Shirley (mdshw5 at gmail.com).
-Wrapper modified by Philip Mabon ( philip.mabon at phac-aspc.gc.ca ).
-Tool dependencies, clean-up and bug-fixes by Marius van den Beek (m.vandenbeek at gmail.com).
-For support and bug reports contact Matt Shirley or Marius van den Beek or go to https://github.com/galaxyproject/tools-iuc.
-    </token>
-</macros>
diff -r 83c7d564b128 -r 9a776b080193 test-data/ERR086330_1.fastq.gz
Binary file test-data/ERR086330_1.fastq.gz has changed
diff -r 83c7d564b128 -r 9a776b080193 test-data/ERR086330_2.fastq.gz
Binary file test-data/ERR086330_2.fastq.gz has changed
diff -r 83c7d564b128 -r 9a776b080193 test-data/SRR002702_1.fastq.gz
Binary file test-data/SRR002702_1.fastq.gz has changed
diff -r 83c7d564b128 -r 9a776b080193 test-data/SRR002702_2.fastq.gz
Binary file test-data/SRR002702_2.fastq.gz has changed
diff -r 83c7d564b128 -r 9a776b080193 test-data/SRR11953971_1.fastq.gz
Binary file test-data/SRR11953971_1.fastq.gz has changed
diff -r 83c7d564b128 -r 9a776b080193 test-data/SRR11953971_2.fastq.gz
Binary file test-data/SRR11953971_2.fastq.gz has changed
diff -r 83c7d564b128 -r 9a776b080193 test-data/SRR522874.fastq.gz
Binary file test-data/SRR522874.fastq.gz has changed
diff -r 83c7d564b128 -r 9a776b080193 test-data/SRR522874.sra_1.fastq.gz
Binary file test-data/SRR522874.sra_1.fastq.gz has changed
diff -r 83c7d564b128 -r 9a776b080193 test-data/SRR522874.sra_2.fastq.gz
Binary file test-data/SRR522874.sra_2.fastq.gz has changed
diff -r 83c7d564b128 -r 9a776b080193 test-data/SRR522874.sra_3.fastq.gz
Binary file test-data/SRR522874.sra_3.fastq.gz has changed
diff -r 83c7d564b128 -r 9a776b080193 test-data/SRR522874.sra_4.fastq.gz
Binary file test-data/SRR522874.sra_4.fastq.gz has changed
diff -r 83c7d564b128 -r 9a776b080193 test-data/SRR522874_1.fastq.gz
Binary file test-data/SRR522874_1.fastq.gz has changed
diff -r 83c7d564b128 -r 9a776b080193 test-data/SRR522874_2.fastq.gz
Binary file test-data/SRR522874_2.fastq.gz has changed
diff -r 83c7d564b128 -r 9a776b080193 test-data/SRR522874_sam_dump_result.sam
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-data/SRR522874_sam_dump_result.sam	Sun Jan 22 17:51:50 2023 +0000
@@ -0,0 +1,6 @@
+ETOOIVN07D9GPH	13	*	0	0	*	*	0	0	GAATCCCGATATCATCATGAA	2L5AW?.A@BAB?A@ABBCN8
+ETOOIVN07D9GPH	141	*	0	0	*	*	0	0	CATTGCTGAAAAACTCGGCGGCTGAGCGGGCTGGCAAGGC	8CN8=BC?]C7.%BA?I5?K7@>AA@AT@/A=K8BK8K7@
+ETOOIVN07ED00L	13	*	0	0	*	*	0	0	ACTGAACACCACGAAGTAGA	5B@@G/:BN8A>AM6CCAA@
+ETOOIVN07ED00L	141	*	0	0	*	*	0	0	AGTCGTACAGACGACGGTTGTCTGAGCGGGCTGGCAAGGC	B7@A?CB>>ABB=BCM6N8==BBBA=AV@1=@K8AJ7K8A
+ETOOIVN07EE1GA	13	*	0	0	*	*	0	0	GGAATTTTTCCGTTGCTGAT	7#K5]B7-$N8BM7BBCB>B
+ETOOIVN07EE1GA	141	*	0	0	*	*	0	0	GCCAGGTGGACGTTAAATATCTGAGCGGGCTGGCAAGGC	9M7BK7AK4A>:N8Z@1<CAC@BA??S?-?@K7AK8K8@
diff -r 83c7d564b128 -r 9a776b080193 test-data/SRR925743_forward.fastqsanger
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-data/SRR925743_forward.fastqsanger	Sun Jan 22 17:51:50 2023 +0000
@@ -0,0 +1,20 @@
+@1/1
+AGGGATGTGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGT
++
+EGGEGGGDFGEEEAEECGDEGGFEEGEFGBEEDDECFEFDD@CDD<EDDE?2@?AEEDEED=D+C?5@A=6:>BA8:>@:4+36945&4354445>/B>@
+@2/1
+AGGGATGTGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGGTAGGGTTAGGGT
++
+HHHHHHEGFHEEFEEHEEHHGGEGGGGEFGFGGGGHHHHFBEEEEEFGGEEAEEEDD0ADDBD9BDBDDA@6?BA;?CD=:-7<<::)1;5,6-6A@?=9
+@3/1
+CCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCCA
++
+HHHHFHHHHHHHHHHHFHHHHHHHHHHHHHHHHHHHHHHHGEFHGEGGFGGGGGGHHHHEFEIDDEEEEEDD4DD;??:6>6<@.<==@?.@@<?#####
+@4/1
+CCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACACTAACCCTAACCCTAACCCTAACCCTA
++
+HHGBHHHHGFHHHHHFDHHFHGEHHHHHEFHHHHEGEGEFFFAFFFDCFGF?@GCDFGFEFHHEFDF*F6DC4DD:A8>@D@CD8->=>=<@CB@#####
+@5/1
+CCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACACTAACCCTCACACTCACCCTA
++
+GGGFGFFGGGFBGGEGGFFGGGCFFGGGGGEGFFFFFGFFGFFFDFFB+FGGFEE?FCF::7B5A?+BB###############################
diff -r 83c7d564b128 -r 9a776b080193 test-data/SRR925743_reverse.fastqsanger
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-data/SRR925743_reverse.fastqsanger	Sun Jan 22 17:51:50 2023 +0000
@@ -0,0 +1,20 @@
+@1/2
+CCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTA
++
+GHHHDFDFGFGEGFBGEGGEGEGGGHGFGHFHFHHHHHHHEF?EFEFF?EHGGHHHGHFHEHDEHGHFFEEE9BDDBEBAD.AD:ACBBC=4@>?5>=+?
+@2/2
+CCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTA
++
+HHHHHHHHHHHHHGHHHHHHGHHHHHHHHHHHFHHHFHHHHHHHHHHHHHHHHHHHGHHHGHHBHGHHFDBDDED5FCFCEEGF<@>>>@,<5<@@?>;D
+@3/2
+ATGGATGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGT
++
+HHHHHHHHHFIEGFHFHDHHHHGFFHGEGDIGGEGGHHHAGEGGGDHHHHHHHHHHHFGDGGGEGDFFF>BEEEE3B;BB;>B7C@DA=DFBDD.BEE=9
+@4/2
+ATGGATGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGT
++
+GFFFHHFFHHHFHHFEFGGBGEEEE?<9?6=>>:=DDDD@DBGDB;DBDBA.ADD8<2<>6A@=A5>550=>>>>BE;EEEDEEE79+336<68=BCEB@
+@5/2
+ATGGATGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGGTAGGGTTAGGGTTAGGGTTAGGGGTAGGGT
++
+479<.>><:<A7BABBE8@=:<<:@BB?C75:2?;.5<<3FEFGEEC88FEDEE=AB><AA@B<ABDC8.27<9:58.58??6<:@>+?=9@########
diff -r 83c7d564b128 -r 9a776b080193 test-data/SRR925743_sam_dump_result.sam
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-data/SRR925743_sam_dump_result.sam	Sun Jan 22 17:51:50 2023 +0000
@@ -0,0 +1,10 @@
+44155511	165	*	0	0	*	17	41275978	0	CATTAATGCTATGCAGATAATCATAGGAATCCCAAATTAATACACTCTTGTGCTGACTTACCAGATGGGACACTCTAAGATTTTCTGCATAGCATTAATG	HHHHHHHHHHHHHHHHHGHDHHHHHHHHHHHHHEHHHHHHHGHHHGHHHHHHHHHHHHHHHHHHHGFHHFHHHHHFHEBGHHHHHD<EFGBBBCAGFGE;	RG:Z:0
+44155516	165	*	0	0	*	17	41275988	0	CATTAATGCTATGCAGATAATCATAGGAATCCCAAATTAATACACTCTTGTGCTGACTTACCAGATGGGACACTCTAAGATTTTCTGCATAGCATTAATG	HHHHHHHHHHHHHHHHFGHHHHHHGHHHHHHHHGHFHHHHHHHEHHHHHFHHHHHFHHHHHHHHHFCCDDHFFHGFHHHBBHFHHFFF@FEFCCBBEE=:	RG:Z:0
+44155520	133	*	0	0	*	17	41276001	0	ATCCCAAATTAATACACTCTTAGAGTGTCCCATCTGGTAAGTCAGCACAAGAGTGTATTAATTTGGGATAGATCGGAAGAGCGTCGTGTAGGGAAAGAGG	HHHHHHHHHHHHHHHHHHHHHGHFHDHFHFHHHHHHHFHBHEHHFHHHHHGGGBGEHGGIHHHHHDHEHHEHHHHBHHHHHFFFFFEHEECHEBDEFEF#	RG:Z:0
+44155522	133	*	0	0	*	17	41276005	0	CAAATTAATACACTCTTCGCGTTGAAGAAGTACAAAATGTCATTAATGCTATGCAGAAAATCTTAGAGTGTCCCATCTGGTAAGTCAGCACAAGAGTGTA	HHHHHHHHHHHGHHHGHHHHGHHHFHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHEHFHEHGHHHHGHHHBHEHFHHHEF3FF######	RG:Z:0
+44155523	133	*	0	0	*	17	41276005	0	CAAATTAATACACTCTTCGCGTTGAAGAAGTACAAAATGTCATTAATGCTATGCAGAAAATCTTAGAGTGTCCCATCTGGTAAGTCAGCACAAGAGTGTA	FGDBGEFFDGGDEFGFFGFG=EACE>CBDDFCFBBDBCCDEGGFEEEE=ECADDFFGD@BGFFEEC8EEE=EEGDBDDDEGBDFG7@B>BAGBADGDEEB	RG:Z:0
+44155531	165	*	0	0	*	17	41276036	0	AAGTTCATTGGGACACTCTAAGATTTTCTGCATAGCATTAATGACATTTTGTACTTCTTCAACGCGAAGAGCAGATAAATCCATTTCTTTCTGTTCCAAT	HFHHEHHHHHHHHHFHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHEHHHHHACFIFGIGHHHFHFGHHHHHFHHFF5HH	RG:Z:0
+44155532	165	*	0	0	*	17	41276056	0	AGAAAGAAATGGATTTTCTGCATAGCATTAATGACATTTTGTACTTCTTCAACGCGAAGAGCAGATAAATCCATTTCTTTCTAGATCGGAAGAGCGTCGT	HHHHHHHHHHHHHHHHHGHHHHHHHHHHHFHHHHHHGHHHHFGHHGHHHHHHHHHHHHHHHEHHFGBGGGFHHHHHHDHHHHHHFGHHC:EA9BEEDDGB	RG:Z:0
+44155533	165	*	0	0	*	17	41276058	0	AGAAAGAAATGGATTTTCTGCATAGCATTAATGACATTTTGTACTTCTTCAACGCGAAGAGCAGATAAATCCATTTCTTTCTAGATCGGAAGAGCGTCGT	HHHHHHHHHHHHHHHHHHHHHHDEHEHHHHEHHHHHHHHHHHHHHHHHHHHHHHGHHHHHHHHHGHEHHEHHHHHHHHHHHHEHHHHHFHHFHHHEEHF9	RG:Z:0
+44155535	165	*	0	0	*	17	41276061	0	AGAAAGAAATGGATTTTCTGCATAGCATTAATGACATTTTGTACTTCTTCAACGCGAAGAGCAGATAAATCCATTTCTTTCTAGATCGGAAGAGCGTCGT	HHHHHHFHHHHHHHHHHHHGHHHFHHHHHFHHHHHFHHHHHHHHHHFHHHGFHHFGHHHHHHHHHEFHHHHHGHHGGHHGHHHHEGH=CHG@E<G@CEA?	RG:Z:0
+44155536	165	*	0	0	*	17	41276063	0	AACAGAAAGAAATGGATTTTCTGCATAGCATTAATGACATTTTGTACTTCTTCAACGCGAAGAGCAGATAAATCCATTTCTTTCTGTTAGATCGGAAGAG	HHHHHHHHHFHHHHHHHHHHHHHHHFHHHHHHHHHHHHHHHHHHHHHHHFHHHHEHEHHHEHGHHHFEHFHHHHHHHHHFHEHHGHFHHHHFBFHHHHHF	RG:Z:0
diff -r 83c7d564b128 -r 9a776b080193 test-data/fastq_dump_result.fastq
--- a/test-data/fastq_dump_result.fastq	Fri Sep 03 16:17:53 2021 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-@1/1
-AGGGATGTGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGT
-+
-EGGEGGGDFGEEEAEECGDEGGFEEGEFGBEEDDECFEFDD@CDD<EDDE?2@?AEEDEED=D+C?5@A=6:>BA8:>@:4+36945&4354445>/B>@
-@1/2
-CCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTA
-+
-GHHHDFDFGFGEGFBGEGGEGEGGGHGFGHFHFHHHHHHHEF?EFEFF?EHGGHHHGHFHEHDEHGHFFEEE9BDDBEBAD.AD:ACBBC=4@>?5>=+?
-@2/1
-AGGGATGTGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGGTAGGGTTAGGGT
-+
-HHHHHHEGFHEEFEEHEEHHGGEGGGGEFGFGGGGHHHHFBEEEEEFGGEEAEEEDD0ADDBD9BDBDDA@6?BA;?CD=:-7<<::)1;5,6-6A@?=9
-@2/2
-CCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTA
-+
-HHHHHHHHHHHHHGHHHHHHGHHHHHHHHHHHFHHHFHHHHHHHHHHHHHHHHHHHGHHHGHHBHGHHFDBDDED5FCFCEEGF<@>>>@,<5<@@?>;D
-@3/1
-CCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCCA
-+
-HHHHFHHHHHHHHHHHFHHHHHHHHHHHHHHHHHHHHHHHGEFHGEGGFGGGGGGHHHHEFEIDDEEEEEDD4DD;??:6>6<@.<==@?.@@<?#####
-@3/2
-ATGGATGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGT
-+
-HHHHHHHHHFIEGFHFHDHHHHGFFHGEGDIGGEGGHHHAGEGGGDHHHHHHHHHHHFGDGGGEGDFFF>BEEEE3B;BB;>B7C@DA=DFBDD.BEE=9
-@4/1
-CCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACACTAACCCTAACCCTAACCCTAACCCTA
-+
-HHGBHHHHGFHHHHHFDHHFHGEHHHHHEFHHHHEGEGEFFFAFFFDCFGF?@GCDFGFEFHHEFDF*F6DC4DD:A8>@D@CD8->=>=<@CB@#####
-@4/2
-ATGGATGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGT
-+
-GFFFHHFFHHHFHHFEFGGBGEEEE?<9?6=>>:=DDDD@DBGDB;DBDBA.ADD8<2<>6A@=A5>550=>>>>BE;EEEDEEE79+336<68=BCEB@
-@5/1
-CCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACCCTAACACTAACCCTCACACTCACCCTA
-+
-GGGFGFFGGGFBGGEGGFFGGGCFFGGGGGEGFFFFFGFFGFFFDFFB+FGGFEE?FCF::7B5A?+BB###############################
-@5/2
-ATGGATGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGTTAGGGGTAGGGTTAGGGTTAGGGTTAGGGGTAGGGT
-+
-479<.>><:<A7BABBE8@=:<<:@BB?C75:2?;.5<<3FEFGEEC88FEDEE=AB><AA@B<ABDC8.27<9:58.58??6<:@>+?=9@########
diff -r 83c7d564b128 -r 9a776b080193 test-data/fastq_dump_result.fastq.gz
Binary file test-data/fastq_dump_result.fastq.gz has changed
diff -r 83c7d564b128 -r 9a776b080193 test-data/sam_dump_result.sam
--- a/test-data/sam_dump_result.sam	Fri Sep 03 16:17:53 2021 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-44155511	165	*	0	0	*	17	41275978	0	CATTAATGCTATGCAGATAATCATAGGAATCCCAAATTAATACACTCTTGTGCTGACTTACCAGATGGGACACTCTAAGATTTTCTGCATAGCATTAATG	HHHHHHHHHHHHHHHHHGHDHHHHHHHHHHHHHEHHHHHHHGHHHGHHHHHHHHHHHHHHHHHHHGFHHFHHHHHFHEBGHHHHHD<EFGBBBCAGFGE;	RG:Z:0
-44155516	165	*	0	0	*	17	41275988	0	CATTAATGCTATGCAGATAATCATAGGAATCCCAAATTAATACACTCTTGTGCTGACTTACCAGATGGGACACTCTAAGATTTTCTGCATAGCATTAATG	HHHHHHHHHHHHHHHHFGHHHHHHGHHHHHHHHGHFHHHHHHHEHHHHHFHHHHHFHHHHHHHHHFCCDDHFFHGFHHHBBHFHHFFF@FEFCCBBEE=:	RG:Z:0
-44155520	133	*	0	0	*	17	41276001	0	ATCCCAAATTAATACACTCTTAGAGTGTCCCATCTGGTAAGTCAGCACAAGAGTGTATTAATTTGGGATAGATCGGAAGAGCGTCGTGTAGGGAAAGAGG	HHHHHHHHHHHHHHHHHHHHHGHFHDHFHFHHHHHHHFHBHEHHFHHHHHGGGBGEHGGIHHHHHDHEHHEHHHHBHHHHHFFFFFEHEECHEBDEFEF#	RG:Z:0
-44155522	133	*	0	0	*	17	41276005	0	CAAATTAATACACTCTTCGCGTTGAAGAAGTACAAAATGTCATTAATGCTATGCAGAAAATCTTAGAGTGTCCCATCTGGTAAGTCAGCACAAGAGTGTA	HHHHHHHHHHHGHHHGHHHHGHHHFHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHEHFHEHGHHHHGHHHBHEHFHHHEF3FF######	RG:Z:0
-44155523	133	*	0	0	*	17	41276005	0	CAAATTAATACACTCTTCGCGTTGAAGAAGTACAAAATGTCATTAATGCTATGCAGAAAATCTTAGAGTGTCCCATCTGGTAAGTCAGCACAAGAGTGTA	FGDBGEFFDGGDEFGFFGFG=EACE>CBDDFCFBBDBCCDEGGFEEEE=ECADDFFGD@BGFFEEC8EEE=EEGDBDDDEGBDFG7@B>BAGBADGDEEB	RG:Z:0
-44155531	165	*	0	0	*	17	41276036	0	AAGTTCATTGGGACACTCTAAGATTTTCTGCATAGCATTAATGACATTTTGTACTTCTTCAACGCGAAGAGCAGATAAATCCATTTCTTTCTGTTCCAAT	HFHHEHHHHHHHHHFHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHEHHHHHACFIFGIGHHHFHFGHHHHHFHHFF5HH	RG:Z:0
-44155532	165	*	0	0	*	17	41276056	0	AGAAAGAAATGGATTTTCTGCATAGCATTAATGACATTTTGTACTTCTTCAACGCGAAGAGCAGATAAATCCATTTCTTTCTAGATCGGAAGAGCGTCGT	HHHHHHHHHHHHHHHHHGHHHHHHHHHHHFHHHHHHGHHHHFGHHGHHHHHHHHHHHHHHHEHHFGBGGGFHHHHHHDHHHHHHFGHHC:EA9BEEDDGB	RG:Z:0
-44155533	165	*	0	0	*	17	41276058	0	AGAAAGAAATGGATTTTCTGCATAGCATTAATGACATTTTGTACTTCTTCAACGCGAAGAGCAGATAAATCCATTTCTTTCTAGATCGGAAGAGCGTCGT	HHHHHHHHHHHHHHHHHHHHHHDEHEHHHHEHHHHHHHHHHHHHHHHHHHHHHHGHHHHHHHHHGHEHHEHHHHHHHHHHHHEHHHHHFHHFHHHEEHF9	RG:Z:0
-44155535	165	*	0	0	*	17	41276061	0	AGAAAGAAATGGATTTTCTGCATAGCATTAATGACATTTTGTACTTCTTCAACGCGAAGAGCAGATAAATCCATTTCTTTCTAGATCGGAAGAGCGTCGT	HHHHHHFHHHHHHHHHHHHGHHHFHHHHHFHHHHHFHHHHHHHHHHFHHHGFHHFGHHHHHHHHHEFHHHHHGHHGGHHGHHHHEGH=CHG@E<G@CEA?	RG:Z:0
-44155536	165	*	0	0	*	17	41276063	0	AACAGAAAGAAATGGATTTTCTGCATAGCATTAATGACATTTTGTACTTCTTCAACGCGAAGAGCAGATAAATCCATTTCTTTCTGTTAGATCGGAAGAG	HHHHHHHHHFHHHHHHHHHHHHHHHFHHHHHHHHHHHHHHHHHHHHHHHFHHHHEHEHHHEHGHHHFEHFHHHHHHHHHFHEHHGHFHHHHFBFHHHHHF	RG:Z:0