kato/cpu-benchmarker-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(search): add configurable sorting for submission results
All checks were successful
Build and Publish Docker Image / deploy (push) Successful in 1m17s
Details

Browse Source 
Introduce a `sort` query parameter in submission search paths and pass it into
store search logic. Matching results can now be ordered by `newest`, `oldest`,
`score_desc`, `score_asc`, `mops_desc`, or `mops_asc`, with invalid values
safely defaulting to `newest`.

Update README and HTTP examples to document the new sort behavior and usage so
clients can control result ordering server-side without extra post-processing.feat(search): add configurable sorting for submission results

Introduce a `sort` query parameter in submission search paths and pass it into
store search logic. Matching results can now be ordered by `newest`, `oldest`,
`score_desc`, `score_asc`, `mops_desc`, or `mops_asc`, with invalid values
safely defaulting to `newest`.

Update README and HTTP examples to document the new sort behavior and usage so
clients can control result ordering server-side without extra post-processing.
This commit is contained in:
Daniel Legt
2026-04-16 00:05:21 +03:00
parent ec86119088
commit c8323d1b6a
5 changed files with 251 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/web/app.go
View File

@@ -33,6 +33,7 @@ type indexPageData struct {
QueryCPU string
QueryThread string
QueryPlatform string
QuerySort string
QueryIntensity int
QueryDuration int
Page int
@@ -104,6 +105,7 @@ func (a *App) handleIndex(w http.ResponseWriter, r *http.Request) {
cpu := strings.TrimSpace(r.URL.Query().Get("cpu"))
thread := strings.TrimSpace(r.URL.Query().Get("thread"))
platform := strings.TrimSpace(r.URL.Query().Get("platform"))
sortBy := normalizeSortFilter(r.URL.Query().Get("sort"))
intensity := parsePositiveInt(r.URL.Query().Get("intensity"), 0)
durationSecs := parsePositiveInt(r.URL.Query().Get("durationSecs"), 0)
@@ -112,8 +114,8 @@ func (a *App) handleIndex(w http.ResponseWriter, r *http.Request) {
totalCount int
)
if text != "" || cpu != "" || thread != "" || platform != "" || intensity > 0 || durationSecs > 0 {
matches := a.store.SearchSubmissions(text, cpu, thread, platform, intensity, durationSecs)
if text != "" || cpu != "" || thread != "" || platform != "" || intensity > 0 || durationSecs > 0 || sortBy != "newest" {
matches := a.store.SearchSubmissions(text, cpu, thread, platform, sortBy, intensity, durationSecs)
totalCount = len(matches)
start, end, normalizedPage := pageBounds(page, a.pageSize, totalCount)
page = normalizedPage
@@ -134,6 +136,7 @@ func (a *App) handleIndex(w http.ResponseWriter, r *http.Request) {
QueryCPU: cpu,
QueryThread: normalizeThreadFilter(thread),
QueryPlatform: normalizePlatformFilter(platform),
QuerySort: sortBy,
QueryIntensity: intensity,
QueryDuration: durationSecs,
Page: page,
@@ -141,8 +144,8 @@ func (a *App) handleIndex(w http.ResponseWriter, r *http.Request) {
TotalCount: totalCount,
ShowingFrom: showingFrom,
ShowingTo: showingTo,
PrevURL: buildIndexURL(max(1, page-1), text, cpu, thread, platform, intensity, durationSecs),
NextURL: buildIndexURL(max(1, min(totalPageCount, page+1)), text, cpu, thread, platform, intensity, durationSecs),
PrevURL: buildIndexURL(max(1, page-1), text, cpu, thread, platform, sortBy, intensity, durationSecs),
NextURL: buildIndexURL(max(1, min(totalPageCount, page+1)), text, cpu, thread, platform, sortBy, intensity, durationSecs),
}
if err := a.templates.ExecuteTemplate(w, "index.html", data); err != nil {
@@ -163,6 +166,7 @@ func (a *App) handleSearch(w http.ResponseWriter, r *http.Request) {
r.URL.Query().Get("cpu"),
r.URL.Query().Get("thread"),
r.URL.Query().Get("platform"),
r.URL.Query().Get("sort"),
parsePositiveInt(r.URL.Query().Get("intensity"), 0),
parsePositiveInt(r.URL.Query().Get("durationSecs"), 0),
)
@@ -359,7 +363,7 @@ func visibleBounds(page, pageSize, visibleCount, total int) (int, int) {
return from, to
}
func buildIndexURL(page int, text, cpu, thread, platform string, intensity, durationSecs int) string {
func buildIndexURL(page int, text, cpu, thread, platform, sortBy string, intensity, durationSecs int) string {
if page < 1 {
page = 1
}
@@ -378,6 +382,9 @@ func buildIndexURL(page int, text, cpu, thread, platform string, intensity, dura
if normalizedPlatform := normalizePlatformFilter(platform); normalizedPlatform != "" {
values.Set("platform", normalizedPlatform)
}
if normalizedSort := normalizeSortFilter(sortBy); normalizedSort != "newest" {
values.Set("sort", normalizedSort)
}
if intensity > 0 {
values.Set("intensity", strconv.Itoa(intensity))
}
@@ -430,6 +437,25 @@ func normalizePlatformFilter(value string) string {
}
}
func normalizeSortFilter(value string) string {
switch strings.ToLower(strings.TrimSpace(value)) {
case "", "newest":
return "newest"
case "oldest":
return "oldest"
case "score_desc":
return "score_desc"
case "score_asc":
return "score_asc"
case "mops_desc":
return "mops_desc"
case "mops_asc":
return "mops_asc"
default:
return "newest"
}
}
func formatInt64(value int64) string {
negative := value < 0
if negative {