Skip to content

Commit

Permalink
Fixes #5887: fix default search order for FTS queries
Browse files Browse the repository at this point in the history
  • Loading branch information
kozlovsky committed Dec 29, 2020
1 parent da3cbf7 commit 38eff97
Show file tree
Hide file tree
Showing 2 changed files with 268 additions and 56 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@

from tribler_core.modules.metadata_store.orm_bindings.channel_node import LEGACY_ENTRY, TODELETE
from tribler_core.modules.metadata_store.orm_bindings.torrent_metadata import NULL_KEY_SUBST
from tribler_core.modules.metadata_store.serialization import CHANNEL_TORRENT, METADATA_NODE, MetadataNodePayload
from tribler_core.modules.metadata_store.serialization import (
CHANNEL_TORRENT,
COLLECTION_NODE,
METADATA_NODE,
MetadataNodePayload,
)
from tribler_core.utilities.unicode import hexlify


Expand Down Expand Up @@ -137,6 +142,16 @@ def get_entries_query(
sort_expression = desc(sort_expression) if sort_desc else sort_expression
pony_query = pony_query.sort_by(sort_expression)

if txt_filter:
if sort_by is None:
pony_query = pony_query.sort_by(
f"""
1 if g.metadata_type == {CHANNEL_TORRENT} else
2 if g.metadata_type == {COLLECTION_NODE} else
3 if g.health.seeders > 0 else 4
"""
)

return pony_query

@classmethod
Expand Down

0 comments on commit 38eff97

Please sign in to comment.