Skip to content

Commit 65bd631

Browse files
committed
Remove large_file and binary_file makos
1 parent 58682b5 commit 65bd631

5 files changed

Lines changed: 4 additions & 32 deletions

File tree

lib/galaxy/datatypes/data.py

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -510,16 +510,7 @@ def _serve_file_download(self, headers, data, trans, to_ext, file_size, **kwd):
510510
def _serve_binary_file_contents_as_text(self, trans, data, headers, file_size, max_peek_size):
511511
headers["content-type"] = "text/html"
512512
with open(data.get_file_name(), "rb") as fh:
513-
return (
514-
trans.fill_template_mako(
515-
"/dataset/binary_file.mako",
516-
data=data,
517-
file_contents=fh.read(max_peek_size),
518-
file_size=util.nice_size(file_size),
519-
truncated=file_size > max_peek_size,
520-
),
521-
headers,
522-
)
513+
return unicodify(fh.read(max_peek_size)), headers
523514

524515
def _serve_file_contents(self, trans, data, headers, preview, file_size, max_peek_size):
525516
from galaxy.datatypes import images
@@ -531,14 +522,7 @@ def _serve_file_contents(self, trans, data, headers, preview, file_size, max_pee
531522
with compression_utils.get_fileobj(data.get_file_name(), "rb") as fh:
532523
# preview large text file
533524
headers["content-type"] = "text/html"
534-
return (
535-
trans.fill_template_mako(
536-
"/dataset/large_file.mako",
537-
truncated_data=fh.read(max_peek_size),
538-
data=data,
539-
),
540-
headers,
541-
)
525+
return unicodify(fh.read(max_peek_size)), headers
542526

543527
def display_data(
544528
self,

lib/galaxy/datatypes/sequence.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,7 @@ def display_data(
337337
mime = "text/plain"
338338
self._clean_and_set_mime_type(trans, mime, headers)
339339
return chunk[:-1], headers
340-
return (
341-
trans.fill_template_mako("/dataset/large_file.mako", truncated_data=chunk[:-1], data=dataset),
342-
headers,
343-
)
340+
return util.unicodify(chunk[:-1]), headers
344341
else:
345342
return super().display_data(trans, dataset, preview, filename, to_ext, **kwd)
346343

lib/galaxy/datatypes/tabular.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,7 @@ def display_data(
197197
else:
198198
headers["content-type"] = "text/html"
199199
with compression_utils.get_fileobj(dataset.get_file_name(), "rb") as fh:
200-
return (
201-
trans.fill_template_mako(
202-
"/dataset/large_file.mako",
203-
truncated_data=fh.read(max_peek_size),
204-
data=dataset,
205-
),
206-
headers,
207-
)
200+
return util.unicodify(fh.read(max_peek_size)), headers
208201
else:
209202
return self.get_chunk(trans, dataset, 0), headers
210203

templates/webapps/galaxy/dataset/binary_file.mako

Lines changed: 0 additions & 1 deletion
This file was deleted.

templates/webapps/galaxy/dataset/large_file.mako

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)