opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "resort the converters so that the accepted_formats are infront"

Browse Source 
This reverts commit 4466431595.
This commit is contained in:
mvdbeek
2018-01-13 13:11:09 +01:00
parent 38c5f71198
commit 6b444f609d
1 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/datatypes/registry.py
+1 -16
View File
@@ -804,7 +804,6 @@ class Registry(object):
converters = odict()
source_datatype = type(self.get_datatype_by_extension(ext))
for ext2, converters_dict in self.datatype_converters.items():
converter_datatype = type(self.get_datatype_by_extension(ext2))
if issubclass(source_datatype, converter_datatype):
converters.update(converters_dict)
@@ -823,21 +822,7 @@ class Registry(object):
def find_conversion_destination_for_dataset_by_extensions(self, dataset, accepted_formats, converter_safe=True):
"""Returns ( target_ext, existing converted dataset )"""
converters = self.get_converters_by_datatype(dataset.ext)
new_order = odict()
accepted_format_keys = list()
for k in accepted_formats:
accepted_format_keys.append(k.file_ext)
if k.file_ext in converters:
new_order[k.file_ext] = converters[k.file_ext]
for k,v in converters.items():
if not k in accepted_format_keys:
new_order[k] = v
for convert_ext in new_order:
for convert_ext in self.get_converters_by_datatype(dataset.ext):
convert_ext_datatype = self.get_datatype_by_extension(convert_ext)
if convert_ext_datatype is None:
self.log.warning("Datatype class not found for extension '%s', which is used as target for conversion from datatype '%s'" % (convert_ext, dataset.ext))