diff --git a/src/tribler/core/components/metadata_store/db/orm_bindings/torrent_metadata.py b/src/tribler/core/components/metadata_store/db/orm_bindings/torrent_metadata.py index f30bcd5a393..fe76814cd4f 100644 --- a/src/tribler/core/components/metadata_store/db/orm_bindings/torrent_metadata.py +++ b/src/tribler/core/components/metadata_store/db/orm_bindings/torrent_metadata.py @@ -143,7 +143,7 @@ def to_simple_dict(self): "num_seeders": self.health.seeders, "num_leechers": self.health.leechers, "last_tracker_check": self.health.last_check, - "updated": int((self.torrent_date - epoch).total_seconds()), + "created": int((self.torrent_date - epoch).total_seconds()), "tag_processor_version": self.tag_processor_version, } ) diff --git a/src/tribler/core/components/metadata_store/restapi/metadata_endpoint_base.py b/src/tribler/core/components/metadata_store/restapi/metadata_endpoint_base.py index 446a7e20a0f..73b3a389544 100644 --- a/src/tribler/core/components/metadata_store/restapi/metadata_endpoint_base.py +++ b/src/tribler/core/components/metadata_store/restapi/metadata_endpoint_base.py @@ -19,7 +19,7 @@ 'size': "size", 'infohash': "infohash", 'date': "torrent_date", - 'updated': "torrent_date", + 'created': "torrent_date", 'status': 'status', 'torrents': 'num_entries', 'votes': 'votes', diff --git a/src/tribler/core/tests/test_search_utils.py b/src/tribler/core/tests/test_search_utils.py index 454782bd968..a2db3d6ac50 100644 --- a/src/tribler/core/tests/test_search_utils.py +++ b/src/tribler/core/tests/test_search_utils.py @@ -148,10 +148,10 @@ def test_title_rank(): def test_item_rank(): - item = dict(name="abc", num_seeders=10, num_leechers=20, updated=time.time() - 10 * DAY) + item = dict(name="abc", num_seeders=10, num_leechers=20, created=time.time() - 10 * DAY) assert item_rank("abc", item) == pytest.approx(0.88794642) # Torrent created ten days ago - item = dict(name="abc", num_seeders=10, num_leechers=20, updated=0) + item = dict(name="abc", num_seeders=10, num_leechers=20, created=0) assert item_rank("abc", item) == pytest.approx(0.81964285) # Torrent creation date is unknown item = dict(name="abc", num_seeders=10, num_leechers=20) diff --git a/src/tribler/core/utilities/search_utils.py b/src/tribler/core/utilities/search_utils.py index 95ea39cb472..b9875e03218 100644 --- a/src/tribler/core/utilities/search_utils.py +++ b/src/tribler/core/utilities/search_utils.py @@ -40,15 +40,15 @@ def item_rank(query: str, item: dict) -> float: :param query: a user-defined query string :param item: a dict with torrent info. - Should include key `name`, can include `num_seeders`, `num_leechers`, `updated` + Should include key `name`, can include `num_seeders`, `num_leechers`, `created` :return: the torrent rank value in range [0, 1] """ title = item['name'] seeders = item.get('num_seeders', 0) leechers = item.get('num_leechers', 0) - updated = item.get('updated', 0) - freshness = None if updated <= 0 else time.time() - updated + created = item.get('created', 0) + freshness = None if created <= 0 else time.time() - created return torrent_rank(query, title, seeders, leechers, freshness) diff --git a/src/tribler/gui/i18n/es_ES.qm b/src/tribler/gui/i18n/es_ES.qm index 1db7458f1b1..854ce5016dc 100644 Binary files a/src/tribler/gui/i18n/es_ES.qm and b/src/tribler/gui/i18n/es_ES.qm differ diff --git a/src/tribler/gui/i18n/es_ES.ts b/src/tribler/gui/i18n/es_ES.ts index accb0fc83ed..66e3b09089c 100644 --- a/src/tribler/gui/i18n/es_ES.ts +++ b/src/tribler/gui/i18n/es_ES.ts @@ -473,6 +473,11 @@ Tenga en cuenta que los valores decimales están truncados. Health Enlaces + + + Created + Creado + Updated diff --git a/src/tribler/gui/i18n/pt_BR.qm b/src/tribler/gui/i18n/pt_BR.qm index f431624b3b6..809bc5990be 100644 Binary files a/src/tribler/gui/i18n/pt_BR.qm and b/src/tribler/gui/i18n/pt_BR.qm differ diff --git a/src/tribler/gui/i18n/pt_BR.ts b/src/tribler/gui/i18n/pt_BR.ts index 714215aacf7..baaeacc12ca 100644 --- a/src/tribler/gui/i18n/pt_BR.ts +++ b/src/tribler/gui/i18n/pt_BR.ts @@ -17,6 +17,11 @@ Torrents Torrents + + + Created + Criado + Updated diff --git a/src/tribler/gui/i18n/ru_RU.qm b/src/tribler/gui/i18n/ru_RU.qm index 6207baba332..310bd7515f9 100644 Binary files a/src/tribler/gui/i18n/ru_RU.qm and b/src/tribler/gui/i18n/ru_RU.qm differ diff --git a/src/tribler/gui/i18n/ru_RU.ts b/src/tribler/gui/i18n/ru_RU.ts index 2ac7e9baee4..229182aac8a 100644 --- a/src/tribler/gui/i18n/ru_RU.ts +++ b/src/tribler/gui/i18n/ru_RU.ts @@ -16,6 +16,11 @@ Health Состояние + + + + Created + Создан diff --git a/src/tribler/gui/i18n/zh_CN.qm b/src/tribler/gui/i18n/zh_CN.qm index a4361fb59ad..6e1e3712997 100644 Binary files a/src/tribler/gui/i18n/zh_CN.qm and b/src/tribler/gui/i18n/zh_CN.qm differ diff --git a/src/tribler/gui/i18n/zh_CN.ts b/src/tribler/gui/i18n/zh_CN.ts index 09f6636accb..b3fac71b039 100644 --- a/src/tribler/gui/i18n/zh_CN.ts +++ b/src/tribler/gui/i18n/zh_CN.ts @@ -17,6 +17,11 @@ Health 健康度 + + + Created + 创建时间 + Updated diff --git a/src/tribler/gui/widgets/tablecontentmodel.py b/src/tribler/gui/widgets/tablecontentmodel.py index a9ad05513a6..43149735201 100644 --- a/src/tribler/gui/widgets/tablecontentmodel.py +++ b/src/tribler/gui/widgets/tablecontentmodel.py @@ -31,7 +31,7 @@ class Column(Enum): NAME = auto() SIZE = auto() HEALTH = auto() - UPDATED = auto() + CREATED = auto() VOTES = auto() STATUS = auto() STATE = auto() @@ -62,7 +62,7 @@ def define_columns(): display_filter=lambda data: (format_size(float(data)) if data != "" else "")), Column.HEALTH: d('health', tr("Health"), width=120, tooltip_filter=lambda data: f"{data}" + ( '' if data == HEALTH_CHECKING else '\n(Click to recheck)'), ), - Column.UPDATED: d('updated', tr("Updated"), width=120, display_filter=lambda timestamp: pretty_date( + Column.CREATED: d('created', tr("Created"), width=120, display_filter=lambda timestamp: pretty_date( timestamp) if timestamp and timestamp > BITTORRENT_BIRTHDAY else "", ), Column.VOTES: d('votes', tr("Popularity"), width=120, display_filter=format_votes, tooltip_filter=lambda data: get_votes_rating_description(data) if data is not None else None, ), @@ -407,7 +407,7 @@ def on_query_results(self, response, remote=False, on_top=False): class ChannelContentModel(RemoteTableModel): - columns_shown = (Column.ACTIONS, Column.CATEGORY, Column.NAME, Column.SIZE, Column.HEALTH, Column.UPDATED) + columns_shown = (Column.ACTIONS, Column.CATEGORY, Column.NAME, Column.SIZE, Column.HEALTH, Column.CREATED) def __init__( self, @@ -705,7 +705,7 @@ def show_remote_results(self): class PopularTorrentsModel(ChannelContentModel): - columns_shown = (Column.CATEGORY, Column.NAME, Column.SIZE, Column.UPDATED) + columns_shown = (Column.CATEGORY, Column.NAME, Column.SIZE, Column.CREATED) def __init__(self, *args, **kwargs): kwargs["endpoint_url"] = 'channels/popular_torrents' @@ -713,7 +713,7 @@ def __init__(self, *args, **kwargs): class DiscoveredChannelsModel(ChannelContentModel): - columns_shown = (Column.SUBSCRIBED, Column.NAME, Column.STATE, Column.TORRENTS, Column.VOTES, Column.UPDATED) + columns_shown = (Column.SUBSCRIBED, Column.NAME, Column.STATE, Column.TORRENTS, Column.VOTES, Column.CREATED) @property def default_sort_column(self): @@ -732,7 +732,7 @@ class PersonalChannelsModel(ChannelContentModel): Column.NAME, Column.SIZE, Column.HEALTH, - Column.UPDATED, + Column.CREATED, Column.STATUS, ) @@ -791,7 +791,7 @@ def edit_enabled(self): class SimplifiedPersonalChannelsModel(PersonalChannelsModel): - columns_shown = (Column.ACTIONS, Column.CATEGORY, Column.NAME, Column.SIZE, Column.HEALTH, Column.UPDATED) + columns_shown = (Column.ACTIONS, Column.CATEGORY, Column.NAME, Column.SIZE, Column.HEALTH, Column.CREATED) def __init__(self, *args, **kwargs): kwargs["exclude_deleted"] = kwargs.get("exclude_deleted", True)