Skip to content

Fix search result ordering for NAME sort #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yigiitcoskun wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix search result ordering for NAME sort #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions src/flatpost.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,6 +1090,66 @@ def matches_search(c):

def sort_components(self, items, sort_mode):
if sort_mode == "NAME":
# When searching, rank by relevance so exact/prefix matches appear
# before arbitrary alphabetically-first entries.
search_text = (self.current_search_text or "").strip().lower()
if search_text:
def get_sort_key(c):
name = (self._d(c, "name", "") or "").strip().lower()
summary = (self._d(c, "summary", "") or "").strip().lower()
desc = (self._d(c, "description", "") or "").strip().lower()
appid = (self._d(c, "id", "") or "").strip().lower()

# Lower tuple values are better.
# Buckets:
# 0 exact name match
# 1 name startswith
# 2 name contains (earlier index wins)
# 3 exact app id match
# 4 app id startswith
# 5 app id contains
# 6 summary contains
# 7 description contains
# 8 fallback: alphabetical
best_bucket = 8
best_index = 0

if name:
if name == search_text:
best_bucket, best_index = 0, 0
elif name.startswith(search_text):
best_bucket, best_index = 1, 0
else:
idx = name.find(search_text)
if idx != -1 and (best_bucket, idx) > (2, idx):
best_bucket, best_index = 2, idx

if appid:
if appid == search_text and (3, 0) < (best_bucket, best_index):
best_bucket, best_index = 3, 0
elif appid.startswith(search_text) and (4, 0) < (best_bucket, best_index):
best_bucket, best_index = 4, 0
else:
idx = appid.find(search_text)
if idx != -1 and (5, idx) < (best_bucket, best_index):
best_bucket, best_index = 5, idx

if summary:
idx = summary.find(search_text)
if idx != -1 and (6, idx) < (best_bucket, best_index):
best_bucket, best_index = 6, idx

if desc:
idx = desc.find(search_text)
if idx != -1 and (7, idx) < (best_bucket, best_index):
best_bucket, best_index = 7, idx

# Tie-breaker: stable alphabetical order.
return (best_bucket, best_index, name or appid or "")

return sorted(items, key=get_sort_key)

# No search text -> default alphabetical behavior.
return sorted(items, key=lambda c: (self._d(c, "name", "") or "").lower())
if sort_mode == "KIND":
return sorted(items, key=lambda c: self._kind_id(self._get_component_kind(c)))
Expand Down