opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-30 18:13:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14760 from bernt-matthias/topic/fix-ext

Browse Source 
do not split "." but the path
This commit is contained in:
Nicola Soranzo
2022-10-07 02:03:28 +02:00
committed by GitHub
parent 39ea7d7a24 3b4900830a
commit 898eac3e19
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/datatypes/data.py
+1 -1
View File
@@ -453,7 +453,7 @@ class Data(metaclass=DataMeta):
mime = mimetypes.guess_type(file_path)[0]
if not mime:
try:
mime = trans.app.datatypes_registry.get_mimetype_by_extension(".".split(file_path)[-1])
mime = trans.app.datatypes_registry.get_mimetype_by_extension(file_path.split(".")[-1])
except Exception:
mime = "text/plain"
self._clean_and_set_mime_type(trans, mime, headers)
lib/galaxy/datatypes/display_applications/parameters.py
+3 -3
View File
@@ -214,7 +214,7 @@ class DisplayParameterValueWrapper:
if self.parameter.guess_mime_type:
mime, encoding = mimetypes.guess_type(self._url)
if not mime:
mime = self.trans.app.datatypes_registry.get_mimetype_by_extension(".".split(self._url)[-1], None)
mime = self.trans.app.datatypes_registry.get_mimetype_by_extension(self._url.split(".")[-1], None)
if mime:
return mime
return "text/plain"
@@ -269,10 +269,10 @@ class DisplayDataValueWrapper(DisplayParameterValueWrapper):
if not mime:
if action_param_extra:
mime = self.trans.app.datatypes_registry.get_mimetype_by_extension(
".".split(action_param_extra)[-1], None
action_param_extra.split(".")[-1], None
)
if not mime:
mime = self.trans.app.datatypes_registry.get_mimetype_by_extension(".".split(self._url)[-1], None)
mime = self.trans.app.datatypes_registry.get_mimetype_by_extension(self._url.split(".")[-1], None)
if mime:
return mime
if hasattr(self.value, "get_mime"):