Commit 8eb77b09 authored by Evan Bolyen's avatar Evan Bolyen
Browse files

Provide explicit sniffer order for qza/qzv

parent f7d2f925

lib/galaxy/config/sample/datatypes_conf.xml.sample

+4 −2
Original line number Diff line number Diff line
@@ -251,10 +251,10 @@ 
    <datatype extension="nrrd" type="galaxy.datatypes.images:Nrrd" mimetype="image/nrrd"/>

    <datatype extension="nhdr" type="galaxy.datatypes.images:Nrrd" subclass="true"/>

    <datatype extension="rna_eps" type="galaxy.datatypes.sequence:RNADotPlotMatrix" mimetype="image/eps" display_in_upload="true"/>

    <datatype extension="qza" type="galaxy.datatypes.qiime2:Qiime2Artifact" mimetype="application/octet-stream" display_in_upload="true">

    <datatype extension="qza" type="galaxy.datatypes.qiime2:QIIME2Artifact" mimetype="application/octet-stream" display_in_upload="true">

      <display file="qiime/qiime2/q2view.xml"/>

    </datatype>

    <datatype extension="qzv" type="galaxy.datatypes.qiime2:Qiime2Visualization" mimetype="application/octet-stream" display_in_upload="true">

    <datatype extension="qzv" type="galaxy.datatypes.qiime2:QIIME2Visualization" mimetype="application/octet-stream" display_in_upload="true">

      <display file="qiime/qiime2/q2view.xml"/>

    </datatype>

    <datatype extension="zip" type="galaxy.datatypes.binary:CompressedZipArchive" display_in_upload="true"/>
@@ -1017,6 +1017,8 @@ 
    <sniffer type="galaxy.datatypes.binary:Edr"/>

    <sniffer type="galaxy.datatypes.binary:Vel"/>

    <sniffer type="galaxy.datatypes.binary:Xlsx"/>

    <sniffer type="galaxy.datatypes.qiime2:QIIME2Artifact"/>

    <sniffer type="galaxy.datatypes.qiime2:QIIME2Visualization"/>

    <sniffer type="galaxy.datatypes.binary:CompressedZipArchive"/>

    <sniffer type="galaxy.datatypes.binary:Pretext"/>

    <sniffer type="galaxy.datatypes.annotation:Augustus"/>

lib/galaxy/datatypes/qiime2.py

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ from galaxy.datatypes.binary import CompressedZipArchive 
from galaxy.datatypes.metadata import MetadataElement





class Qiime2Result(CompressedZipArchive):

class QIIME2Result(CompressedZipArchive):

    MetadataElement(name="semantic_type", readonly=True)

    MetadataElement(name="semantic_type_simple", readonly=True, visible=False)

    MetadataElement(name="uuid", readonly=True)
@@ -60,7 +60,7 @@ class Qiime2Result(CompressedZipArchive): 
            return False





class Qiime2Artifact(Qiime2Result):

class QIIME2Artifact(Qiime2Result):

    file_ext = "qza"



    def sniff(self, filename):
@@ -68,7 +68,7 @@ class Qiime2Artifact(Qiime2Result): 
        return metadata and metadata['semantic_type'] != 'Visualization'





class Qiime2Visualization(Qiime2Result):

class QIIME2Visualization(Qiime2Result):

    file_ext = "qzv"



    def sniff(self, filename):