CEF/mediamtx
1
0
Fork 0
forked from External/mediamtx
Code Pull requests Activity

api: return empty list when page is empty (#2604) (#2614)

Browse source
This commit is contained in:
Alessandro Ros 2023-10-30 19:53:16 +01:00 • committed by GitHub
parent ecee2af05c
commit e9528c0917
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/core/api.go
View file

@ -36,12 +36,12 @@ func paginate2(itemsPtr interface{}, itemsPerPage int, page int) int {
} }
min := page * itemsPerPage min := page * itemsPerPage
if min >= itemsLen { if min > itemsLen {
min = itemsLen - 1 min = itemsLen
} }
max := (page + 1) * itemsPerPage max := (page + 1) * itemsPerPage
if max >= itemsLen { if max > itemsLen {
max = itemsLen max = itemsLen
} }

6
internal/core/api_test.go
View file

@ -121,17 +121,17 @@ func TestPagination(t *testing.T) {
pageCount, err = paginate(&items, "3", "2") pageCount, err = paginate(&items, "3", "2")
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, 2, pageCount) require.Equal(t, 2, pageCount)
require.Equal(t, []int{4}, items) require.Equal(t, []int{}, items)
items = make([]int, 6) items = make([]int, 6)
for i := 0; i < 6; i++ { for i := 0; i < 6; i++ {
items[i] = i items[i] = i
} }
pageCount, err = paginate(&items, "3", "3") pageCount, err = paginate(&items, "4", "1")
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, 2, pageCount) require.Equal(t, 2, pageCount)
require.Equal(t, []int{5}, items) require.Equal(t, []int{4, 5}, items)
} }
func TestAPIConfigGlobalGet(t *testing.T) { func TestAPIConfigGlobalGet(t *testing.T) {