From 63c4c0fab5d6e1b24f8a7dc6f8537b2a5e9b8e5f Mon Sep 17 00:00:00 2001 From: Paxx Date: Wed, 28 Jun 2023 11:16:04 +0200 Subject: [PATCH] fix: improved the RequestRecordingStart internal struct obj. Extracted it to another struct --- ovenmedia/request.go | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/ovenmedia/request.go b/ovenmedia/request.go index f09bd77..e23675c 100644 --- a/ovenmedia/request.go +++ b/ovenmedia/request.go @@ -5,14 +5,11 @@ type RequestCreateVirtualHost struct { } type RequestBodyPush struct { - ID string `json:"id" required:"true" validate:"nonnil,min=1"` - Stream struct { - Name string `json:"name"` - Tracks []int `json:"tracks"` - } `json:"stream"` - Protocol string `json:"protocol" required:"true" validate:"nonnil,min=1"` - URL string `json:"url" required:"true" validate:"nonnil,min=1"` - StreamKey string `json:"streamKey" required:"true" validate:"nonnil,min=1"` + ID string `json:"id" required:"true" validate:"nonnil,min=1"` + Stream SimpleStream `json:"stream"` + Protocol string `json:"protocol" required:"true" validate:"nonnil,min=1"` + URL string `json:"url" required:"true" validate:"nonnil,min=1"` + StreamKey string `json:"streamKey" required:"true" validate:"nonnil,min=1"` } /* recording */ @@ -33,16 +30,18 @@ type RequestBodyPush struct { } */ type RequestRecordingStart struct { - ID string `json:"id" required:"true" validate:"nonnil,min=1"` - Stream struct { - Name string `json:"name"` - Tracks []int `json:"tracks"` - } `json:"stream"` - FilePath string `json:"filePath" required:"true" validate:"nonnil,min=1"` - InfoPath string `json:"infoPath" required:"true" validate:"nonnil,min=1"` - Interval *int `json:"interval,omitempty"` - Schedule *string `json:"schedule,omitempty"` - SegmentationRule *string `json:"segmentationRule,omitempty"` + ID string `json:"id" required:"true" validate:"nonnil,min=1"` + Stream SimpleStream `json:"stream"` + FilePath string `json:"filePath" required:"true" validate:"nonnil,min=1"` + InfoPath string `json:"infoPath" required:"true" validate:"nonnil,min=1"` + Interval *int `json:"interval,omitempty"` + Schedule *string `json:"schedule,omitempty"` + SegmentationRule *string `json:"segmentationRule,omitempty"` +} + +type SimpleStream struct { + Name string `json:"name"` + Tracks []int `json:"tracks"` } /*