Unverified Commit c118dd53 authored by mvdbeek's avatar mvdbeek
Browse files

Improve displayable function

parent 881ed5c7

lib/galaxy/datatypes/interval.py

+4 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ from galaxy.datatypes.util.gff_util import ( 
    parse_gff3_attributes,

    parse_gff_attributes,

)

from galaxy.model import DatasetInstance

from galaxy.util import compression_utils

from . import (

    data,
@@ -167,10 +168,11 @@ class Interval(Tabular): 
                    else:

                        empty_line_count += 1



    def displayable(self, dataset):

    def displayable(self, dataset: DatasetInstance):

        try:

            return (

                dataset.has_data()

                not dataset.dataset.purged

                and dataset.has_data()

                and dataset.state == dataset.states.OK

                and dataset.metadata.columns > 0

                and dataset.metadata.data_lines != 0

lib/galaxy/datatypes/tabular.py

+4 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ from galaxy.datatypes.sniff import ( 
    iter_headers,

    validate_tabular,

)

from galaxy.model import DatasetInstance

from galaxy.util import compression_utils

from . import dataproviders
@@ -90,10 +91,11 @@ class TabularData(data.Text): 
        if dataset.metadata.comment_lines:

            dataset.blurb = f"{dataset.blurb}, {util.commaify(str(dataset.metadata.comment_lines))} comments"



    def displayable(self, dataset):

    def displayable(self, dataset: DatasetInstance):

        try:

            return (

                dataset.has_data()

                not dataset.dataset.purged

                and dataset.has_data()

                and dataset.state == dataset.states.OK

                and dataset.metadata.columns > 0

                and dataset.metadata.data_lines != 0