Unverified Commit 627ec090 authored by Arash's avatar Arash
Browse files

Fixing docx detection

parent a8c7df70

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

+1 −0
Original line number Diff line number Diff line
@@ -1268,6 +1268,7 @@ 
    <sniffer type="galaxy.datatypes.binary:Edr"/>

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

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

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

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

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

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

lib/galaxy/datatypes/binary.py

+1 −0
Original line number Diff line number Diff line
@@ -3184,6 +3184,7 @@ class Docx(Binary): 


    file_ext = "docx"

    compressed = True

    display_behavior = "download"  # Office documents trigger downloads



    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:

        # Docx is compressed in zip format and must not be uncompressed in Galaxy.

lib/galaxy/datatypes/sniff.py

+5 −1
Original line number Diff line number Diff line
@@ -52,7 +52,11 @@ if TYPE_CHECKING: 
log = logging.getLogger(__name__)



SNIFF_PREFIX_BYTES = int(os.environ.get("GALAXY_SNIFF_PREFIX_BYTES", None) or 2**20)

BINARY_MIMETYPES = {"application/pdf", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"}

BINARY_MIMETYPES = {

    "application/pdf",

    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",

    "application/vnd.openxmlformats-officedocument.wordprocessingml.document",

}





def get_test_fname(fname):