amigan/stillbox
1
0
Fork 0
Code Issues 16 Pull requests Projects Releases Packages Wiki Activity Actions

Make makeCall

Browse source
This commit is contained in:
Daniel 2024-08-14 09:32:53 -04:00
parent d4b3d57a89
commit 7638564b81
3 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/calls/call.go
View file

@ -50,6 +50,15 @@ type Call struct {
TalkgroupTag *string TalkgroupTag *string
} }
func Make(call *Call) (*Call, error) {
err := call.computeLength()
if err != nil {
return nil, err
}
return call, nil
}
func toInt64Slice(s []int) []int64 { func toInt64Slice(s []int) []int64 {
n := make([]int64, len(s)) n := make([]int64, len(s))
for i := range s { for i := range s {
@ -85,7 +94,7 @@ func (c *Call) ToPB() *pb.Call {
} }
} }
func (c *Call) ComputeLength() (err error) { func (c *Call) computeLength() (err error) {
var td time.Duration var td time.Duration
switch c.AudioType { switch c.AudioType {

7
pkg/gordio/server/ingest.go
View file

@ -4,15 +4,8 @@ import (
"context" "context"
"dynatron.me/x/stillbox/pkg/calls" "dynatron.me/x/stillbox/pkg/calls"
"github.com/rs/zerolog/log"
) )
func (s *Server) Ingest(ctx context.Context, call *calls.Call) { func (s *Server) Ingest(ctx context.Context, call *calls.Call) {
err := call.ComputeLength()
if err != nil {
log.Error().Err(err).Msg("compute length failed")
}
s.sinks.EmitCall(context.Background(), call) s.sinks.EmitCall(context.Background(), call)
} }

14
pkg/gordio/sources/http.go
View file

@ -73,8 +73,8 @@ func (car *callUploadRequest) mimeType() string {
return "" return ""
} }
func (car *callUploadRequest) toCall(submitter auth.UserID) *calls.Call { func (car *callUploadRequest) toCall(submitter auth.UserID) (*calls.Call, error) {
return &calls.Call{ return calls.Make(&calls.Call{
Submitter: &submitter, Submitter: &submitter,
System: car.System, System: car.System,
Talkgroup: car.Talkgroup, Talkgroup: car.Talkgroup,
@ -89,7 +89,7 @@ func (car *callUploadRequest) toCall(submitter auth.UserID) *calls.Call {
TalkgroupTag: common.PtrOrNull(car.TalkgroupTag), TalkgroupTag: common.PtrOrNull(car.TalkgroupTag),
TalkgroupGroup: common.PtrOrNull(car.TalkgroupGroup), TalkgroupGroup: common.PtrOrNull(car.TalkgroupGroup),
Source: car.Source, Source: car.Source,
} })
} }
func (h *RdioHTTP) routeCallUpload(w http.ResponseWriter, r *http.Request) { func (h *RdioHTTP) routeCallUpload(w http.ResponseWriter, r *http.Request) {
@ -120,7 +120,13 @@ func (h *RdioHTTP) routeCallUpload(w http.ResponseWriter, r *http.Request) {
return return
} }
h.ing.Ingest(ctx, cur.toCall(*submitter)) call, err := cur.toCall(*submitter)
if err != nil {
log.Error().Err(err).Msg("toCall failed")
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
h.ing.Ingest(ctx, call)
log.Info().Int("system", cur.System).Int("tgid", cur.Talkgroup).Msg("ingested") log.Info().Int("system", cur.System).Int("tgid", cur.Talkgroup).Msg("ingested")