STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore result.Total logic, fix formatting

Browse source 
This change restores the original logic of passing the search total count logic as is to the result.

Additionally, this undoes some of the contributor's formatting changes that increase the changed lines to review.
This commit is contained in:
Andy Feller 2025-04-15 08:00:47 -04:00
parent 072534c388
commit 15ff7ba465
1 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
pkg/search/searcher.go
View file

@ -87,13 +87,11 @@ func (s searcher) Code(query Query) (CodeResult, error) {
return result, err
}
result.IncompleteResults = page.IncompleteResults
// If we're going to reach the requested limit, only add that many items,
// otherwise add all the results.
itemsToAdd := min(len(page.Items), toRetrieve)
result.Total += itemsToAdd
result.IncompleteResults = page.IncompleteResults
result.Total = page.Total
result.Items = append(result.Items, page.Items[:itemsToAdd]...)
toRetrieve = toRetrieve - itemsToAdd
}
@ -122,11 +120,9 @@ func (s searcher) Commits(query Query) (CommitsResult, error) {
return result, err
}
result.IncompleteResults = page.IncompleteResults
itemsToAdd := min(len(page.Items), toRetrieve)
result.Total += itemsToAdd
result.IncompleteResults = page.IncompleteResults
result.Total = page.Total
result.Items = append(result.Items, page.Items[:itemsToAdd]...)
toRetrieve = toRetrieve - itemsToAdd
}
@ -154,10 +150,8 @@ func (s searcher) Repositories(query Query) (RepositoriesResult, error) {
return result, err
}
result.IncompleteResults = page.IncompleteResults
itemsToAdd := min(len(page.Items), toRetrieve)
result.IncompleteResults = page.IncompleteResults
result.Total += itemsToAdd
result.Items = append(result.Items, page.Items[:itemsToAdd]...)
toRetrieve = toRetrieve - itemsToAdd
@ -186,10 +180,8 @@ func (s searcher) Issues(query Query) (IssuesResult, error) {
return result, err
}
result.IncompleteResults = page.IncompleteResults
itemsToAdd := min(len(page.Items), toRetrieve)
result.IncompleteResults = page.IncompleteResults
result.Total += itemsToAdd
result.Items = append(result.Items, page.Items[:itemsToAdd]...)
toRetrieve = toRetrieve - itemsToAdd