From ded75caeb4d3ee0cebdac95efcd9babc0e397c78 Mon Sep 17 00:00:00 2001 From: guerler Date: Sun, 19 Oct 2025 07:45:25 +0300 Subject: [PATCH] Remove large_file and binary_file makos --- lib/galaxy/datatypes/data.py | 20 ++----------------- lib/galaxy/datatypes/sequence.py | 5 +---- lib/galaxy/datatypes/tabular.py | 9 +-------- .../webapps/galaxy/dataset/binary_file.mako | 1 - .../webapps/galaxy/dataset/large_file.mako | 1 - 5 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 templates/webapps/galaxy/dataset/binary_file.mako delete mode 100644 templates/webapps/galaxy/dataset/large_file.mako diff --git a/lib/galaxy/datatypes/data.py b/lib/galaxy/datatypes/data.py index 62aaa6c9174..95bf7c66274 100644 --- a/lib/galaxy/datatypes/data.py +++ b/lib/galaxy/datatypes/data.py @@ -510,16 +510,7 @@ class Data(metaclass=DataMeta): def _serve_binary_file_contents_as_text(self, trans, data, headers, file_size, max_peek_size): headers["content-type"] = "text/html" with open(data.get_file_name(), "rb") as fh: - return ( - trans.fill_template_mako( - "/dataset/binary_file.mako", - data=data, - file_contents=fh.read(max_peek_size), - file_size=util.nice_size(file_size), - truncated=file_size > max_peek_size, - ), - headers, - ) + return unicodify(fh.read(max_peek_size)), headers def _serve_file_contents(self, trans, data, headers, preview, file_size, max_peek_size): from galaxy.datatypes import images @@ -531,14 +522,7 @@ class Data(metaclass=DataMeta): with compression_utils.get_fileobj(data.get_file_name(), "rb") as fh: # preview large text file headers["content-type"] = "text/html" - return ( - trans.fill_template_mako( - "/dataset/large_file.mako", - truncated_data=fh.read(max_peek_size), - data=data, - ), - headers, - ) + return unicodify(fh.read(max_peek_size)), headers def display_data( self, diff --git a/lib/galaxy/datatypes/sequence.py b/lib/galaxy/datatypes/sequence.py index ee6f52b1e6f..baede574464 100644 --- a/lib/galaxy/datatypes/sequence.py +++ b/lib/galaxy/datatypes/sequence.py @@ -337,10 +337,7 @@ class Sequence(data.Text): mime = "text/plain" self._clean_and_set_mime_type(trans, mime, headers) return chunk[:-1], headers - return ( - trans.fill_template_mako("/dataset/large_file.mako", truncated_data=chunk[:-1], data=dataset), - headers, - ) + return util.unicodify(chunk[:-1]), headers else: return super().display_data(trans, dataset, preview, filename, to_ext, **kwd) diff --git a/lib/galaxy/datatypes/tabular.py b/lib/galaxy/datatypes/tabular.py index a74d002b017..62a00e45b87 100644 --- a/lib/galaxy/datatypes/tabular.py +++ b/lib/galaxy/datatypes/tabular.py @@ -197,14 +197,7 @@ class TabularData(Text): else: headers["content-type"] = "text/html" with compression_utils.get_fileobj(dataset.get_file_name(), "rb") as fh: - return ( - trans.fill_template_mako( - "/dataset/large_file.mako", - truncated_data=fh.read(max_peek_size), - data=dataset, - ), - headers, - ) + return util.unicodify(fh.read(max_peek_size)), headers else: return self.get_chunk(trans, dataset, 0), headers diff --git a/templates/webapps/galaxy/dataset/binary_file.mako b/templates/webapps/galaxy/dataset/binary_file.mako deleted file mode 100644 index 7cf3a574cda..00000000000 --- a/templates/webapps/galaxy/dataset/binary_file.mako +++ /dev/null @@ -1 +0,0 @@ -${ util.unicodify( file_contents ) | h } \ No newline at end of file diff --git a/templates/webapps/galaxy/dataset/large_file.mako b/templates/webapps/galaxy/dataset/large_file.mako deleted file mode 100644 index 2507f69ae5b..00000000000 --- a/templates/webapps/galaxy/dataset/large_file.mako +++ /dev/null @@ -1 +0,0 @@ -${ util.unicodify( truncated_data ) | h } \ No newline at end of file