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

Merge branch 'release_20.09' into dev

Browse Source
This commit is contained in:
mvdbeek
2021-01-12 13:54:41 +01:00
parent 7053b1a00c e10a0d529f
commit 88ad4f35b7
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/datatypes/data.py
+5 -7
View File
@@ -409,7 +409,7 @@ class Data(metaclass=DataMeta):
return self._archive_composite_dataset(trans, data, do_action=kwd.get('do_action', 'zip'))
else:
trans.response.headers['Content-Length'] = str(os.stat(data.file_name).st_size)
filename = self._download_filename(data, to_ext, hdca=kwd.get("hdca"), element_identifier=kwd.get("element_identifier"), filename_pattern=kwd.get("filename_pattern"))
filename = self._download_filename(data, to_ext, hdca=kwd.get("hdca"), element_identifier=kwd.get("element_identifier"))
trans.response.set_content_type("application/octet-stream") # force octet-stream so Safari doesn't append mime extensions to filename
trans.response.headers["Content-Disposition"] = 'attachment; filename="%s"' % filename
return open(data.file_name, 'rb')
@@ -472,7 +472,7 @@ class Data(metaclass=DataMeta):
return open(filename, mode='rb')
def _download_filename(self, dataset, to_ext, hdca=None, element_identifier=None, filename_pattern=None):
def _download_filename(self, dataset, to_ext, hdca=None, element_identifier=None):
def escape(raw_identifier):
return ''.join(c in FILENAME_VALID_CHARS and c or '_' for c in raw_identifier)[0:150]
@@ -487,11 +487,7 @@ class Data(metaclass=DataMeta):
"hid": dataset.hid,
}
if not filename_pattern:
if hdca is None:
filename_pattern = DOWNLOAD_FILENAME_PATTERN_DATASET
else:
filename_pattern = DOWNLOAD_FILENAME_PATTERN_COLLECTION_ELEMENT
filename_pattern = DOWNLOAD_FILENAME_PATTERN_DATASET
if hdca is not None:
# Use collection context to build up filename.
@@ -499,6 +495,8 @@ class Data(metaclass=DataMeta):
template_values["hdca_name"] = escape(hdca.name)
template_values["hdca_hid"] = hdca.hid
filename_pattern = DOWNLOAD_FILENAME_PATTERN_COLLECTION_ELEMENT
return string.Template(filename_pattern).substitute(**template_values)
def display_name(self, dataset):