Browse Source

api: sort results of /list endpoints (#1828)

pull/1834/head
Alessandro Ros 3 years ago committed by GitHub
parent
commit
6cb3ff0d55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      internal/core/hls_manager.go
  2. 5
      internal/core/path_manager.go
  3. 5
      internal/core/rtmp_server.go
  4. 9
      internal/core/rtsp_server.go
  5. 13
      internal/core/webrtc_manager.go

5
internal/core/hls_manager.go

@ -3,6 +3,7 @@ package core
import ( import (
"context" "context"
"fmt" "fmt"
"sort"
"sync" "sync"
"github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/conf"
@ -200,6 +201,10 @@ outer:
data.Items = append(data.Items, muxer.apiItem()) data.Items = append(data.Items, muxer.apiItem())
} }
sort.Slice(data.Items, func(i, j int) bool {
return data.Items[i].Created.Before(data.Items[j].Created)
})
req.res <- hlsManagerAPIMuxersListRes{ req.res <- hlsManagerAPIMuxersListRes{
data: data, data: data,
} }

5
internal/core/path_manager.go

@ -3,6 +3,7 @@ package core
import ( import (
"context" "context"
"fmt" "fmt"
"sort"
"sync" "sync"
"github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/conf"
@ -513,6 +514,10 @@ func (pm *pathManager) apiPathsList() (*apiPathsList, error) {
res.data.Items = append(res.data.Items, item) res.data.Items = append(res.data.Items, item)
} }
sort.Slice(res.data.Items, func(i, j int) bool {
return res.data.Items[i].Name < res.data.Items[j].Name
})
return res.data, nil return res.data, nil
case <-pm.ctx.Done(): case <-pm.ctx.Done():

5
internal/core/rtmp_server.go

@ -5,6 +5,7 @@ import (
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"net" "net"
"sort"
"sync" "sync"
"github.com/google/uuid" "github.com/google/uuid"
@ -223,6 +224,10 @@ outer:
data.Items = append(data.Items, c.apiItem()) data.Items = append(data.Items, c.apiItem())
} }
sort.Slice(data.Items, func(i, j int) bool {
return data.Items[i].Created.Before(data.Items[j].Created)
})
req.res <- rtmpServerAPIConnsListRes{data: data} req.res <- rtmpServerAPIConnsListRes{data: data}
case req := <-s.chAPIConnsGet: case req := <-s.chAPIConnsGet:

9
internal/core/rtsp_server.go

@ -4,6 +4,7 @@ import (
"context" "context"
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"sort"
"strings" "strings"
"sync" "sync"
"time" "time"
@ -360,6 +361,10 @@ func (s *rtspServer) apiConnsList() (*apiRTSPConnsList, error) {
data.Items = append(data.Items, c.apiItem()) data.Items = append(data.Items, c.apiItem())
} }
sort.Slice(data.Items, func(i, j int) bool {
return data.Items[i].Created.Before(data.Items[j].Created)
})
return data, nil return data, nil
} }
@ -401,6 +406,10 @@ func (s *rtspServer) apiSessionsList() (*apiRTSPSessionsList, error) {
data.Items = append(data.Items, s.apiItem()) data.Items = append(data.Items, s.apiItem())
} }
sort.Slice(data.Items, func(i, j int) bool {
return data.Items[i].Created.Before(data.Items[j].Created)
})
return data, nil return data, nil
} }

13
internal/core/webrtc_manager.go

@ -10,6 +10,7 @@ import (
"net" "net"
"net/http" "net/http"
"regexp" "regexp"
"sort"
"strconv" "strconv"
"strings" "strings"
"sync" "sync"
@ -150,7 +151,7 @@ type webRTCManager struct {
chSessionClose chan *webRTCSession chSessionClose chan *webRTCSession
chSessionAddCandidates chan webRTCSessionAddCandidatesReq chSessionAddCandidates chan webRTCSessionAddCandidatesReq
chAPISessionsList chan webRTCManagerAPISessionsListReq chAPISessionsList chan webRTCManagerAPISessionsListReq
chAPIConnsGet chan webRTCManagerAPISessionsGetReq chAPISessionsGet chan webRTCManagerAPISessionsGetReq
chAPIConnsKick chan webRTCManagerAPISessionsKickReq chAPIConnsKick chan webRTCManagerAPISessionsKickReq
// out // out
@ -194,7 +195,7 @@ func newWebRTCManager(
chSessionClose: make(chan *webRTCSession), chSessionClose: make(chan *webRTCSession),
chSessionAddCandidates: make(chan webRTCSessionAddCandidatesReq), chSessionAddCandidates: make(chan webRTCSessionAddCandidatesReq),
chAPISessionsList: make(chan webRTCManagerAPISessionsListReq), chAPISessionsList: make(chan webRTCManagerAPISessionsListReq),
chAPIConnsGet: make(chan webRTCManagerAPISessionsGetReq), chAPISessionsGet: make(chan webRTCManagerAPISessionsGetReq),
chAPIConnsKick: make(chan webRTCManagerAPISessionsKickReq), chAPIConnsKick: make(chan webRTCManagerAPISessionsKickReq),
done: make(chan struct{}), done: make(chan struct{}),
} }
@ -312,9 +313,13 @@ outer:
data.Items = append(data.Items, sx.apiItem()) data.Items = append(data.Items, sx.apiItem())
} }
sort.Slice(data.Items, func(i, j int) bool {
return data.Items[i].Created.Before(data.Items[j].Created)
})
req.res <- webRTCManagerAPISessionsListRes{data: data} req.res <- webRTCManagerAPISessionsListRes{data: data}
case req := <-m.chAPIConnsGet: case req := <-m.chAPISessionsGet:
sx := m.findSessionByUUID(req.uuid) sx := m.findSessionByUUID(req.uuid)
if sx == nil { if sx == nil {
req.res <- webRTCManagerAPISessionsGetRes{err: fmt.Errorf("not found")} req.res <- webRTCManagerAPISessionsGetRes{err: fmt.Errorf("not found")}
@ -479,7 +484,7 @@ func (m *webRTCManager) apiSessionsGet(uuid uuid.UUID) (*apiWebRTCSession, error
} }
select { select {
case m.chAPIConnsGet <- req: case m.chAPISessionsGet <- req:
res := <-req.res res := <-req.res
return res.data, res.err return res.data, res.err

Loading…
Cancel
Save