From 652751d11d5a70f5bb8858fb99f54eb50db84afe Mon Sep 17 00:00:00 2001 From: Yvan Le Bras Date: Wed, 20 Sep 2023 18:23:14 +0200 Subject: [PATCH 1/6] Update datatypes_conf.xml.sample with docx type --- lib/galaxy/config/sample/datatypes_conf.xml.sample | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/galaxy/config/sample/datatypes_conf.xml.sample b/lib/galaxy/config/sample/datatypes_conf.xml.sample index 189bb83a95d..07f6e8aeb91 100644 --- a/lib/galaxy/config/sample/datatypes_conf.xml.sample +++ b/lib/galaxy/config/sample/datatypes_conf.xml.sample @@ -567,6 +567,8 @@ + + From 12ce9f147823dd3d3b30fd132abe35a95cc2c414 Mon Sep 17 00:00:00 2001 From: Yvan Le Bras Date: Wed, 20 Sep 2023 20:45:47 +0200 Subject: [PATCH 2/6] Update binary.py add Docx binary type --- lib/galaxy/datatypes/binary.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/galaxy/datatypes/binary.py b/lib/galaxy/datatypes/binary.py index 02263119521..49e22a7d114 100644 --- a/lib/galaxy/datatypes/binary.py +++ b/lib/galaxy/datatypes/binary.py @@ -4540,3 +4540,11 @@ class FITS(Binary): return dataset.peek except Exception: return f"Binary FITS file size ({nice_size(dataset.get_size())})" + +class Docx(Binary): + """ + Docx file. + Docx files are generated and used by Microsoft word software as a format to store text informations. + """ + + file_ext = "docx" From 7d0dfdf7dba0a1eaed8f25405d1ff26892affc92 Mon Sep 17 00:00:00 2001 From: Yvan Le Bras Date: Wed, 20 Sep 2023 20:46:25 +0200 Subject: [PATCH 3/6] Update datatypes_conf.xml.sample --- lib/galaxy/config/sample/datatypes_conf.xml.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/config/sample/datatypes_conf.xml.sample b/lib/galaxy/config/sample/datatypes_conf.xml.sample index 07f6e8aeb91..69dae957dda 100644 --- a/lib/galaxy/config/sample/datatypes_conf.xml.sample +++ b/lib/galaxy/config/sample/datatypes_conf.xml.sample @@ -568,7 +568,7 @@ - + From 7174abc21fbe28c09cae6dc0684f706fd7d54dc4 Mon Sep 17 00:00:00 2001 From: Yvan Le Bras Date: Thu, 21 Sep 2023 12:30:22 +0200 Subject: [PATCH 4/6] Update datatypes_conf.xml.sample --- lib/galaxy/config/sample/datatypes_conf.xml.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/config/sample/datatypes_conf.xml.sample b/lib/galaxy/config/sample/datatypes_conf.xml.sample index 69dae957dda..76e1059b8c6 100644 --- a/lib/galaxy/config/sample/datatypes_conf.xml.sample +++ b/lib/galaxy/config/sample/datatypes_conf.xml.sample @@ -568,7 +568,7 @@ - + From 51028aecad5c643c5287b9467285bf6152fa014f Mon Sep 17 00:00:00 2001 From: Yvan Le Bras Date: Thu, 21 Sep 2023 12:30:52 +0200 Subject: [PATCH 5/6] Update binary.py --- lib/galaxy/datatypes/binary.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lib/galaxy/datatypes/binary.py b/lib/galaxy/datatypes/binary.py index 49e22a7d114..02263119521 100644 --- a/lib/galaxy/datatypes/binary.py +++ b/lib/galaxy/datatypes/binary.py @@ -4540,11 +4540,3 @@ class FITS(Binary): return dataset.peek except Exception: return f"Binary FITS file size ({nice_size(dataset.get_size())})" - -class Docx(Binary): - """ - Docx file. - Docx files are generated and used by Microsoft word software as a format to store text informations. - """ - - file_ext = "docx" From 4603b0ed65416a930548055e5c16a9384833a03b Mon Sep 17 00:00:00 2001 From: Yvan Le Bras Date: Mon, 2 Oct 2023 11:23:19 +0200 Subject: [PATCH 6/6] Update lib/galaxy/config/sample/datatypes_conf.xml.sample MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Björn Grüning --- lib/galaxy/config/sample/datatypes_conf.xml.sample | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/galaxy/config/sample/datatypes_conf.xml.sample b/lib/galaxy/config/sample/datatypes_conf.xml.sample index 76e1059b8c6..143e48a96aa 100644 --- a/lib/galaxy/config/sample/datatypes_conf.xml.sample +++ b/lib/galaxy/config/sample/datatypes_conf.xml.sample @@ -567,8 +567,7 @@ - - +