From 3a7d86ec0308f27df217a326d3d8eb3fea5e58f0 Mon Sep 17 00:00:00 2001
From: Alessandro Ros <aler9.dev@gmail.com>
Date: Sat, 23 Sep 2023 12:48:34 +0200
Subject: [PATCH] normalize configuration (#2399)

---
 internal/conf/path.go            |  4 ++--
 internal/conf/rtsp_range_type.go | 34 ++++++++++++++++----------------
 internal/core/rtsp_source.go     | 14 ++++++-------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/internal/conf/path.go b/internal/conf/path.go
index cd71749d..d4156f96 100644
--- a/internal/conf/path.go
+++ b/internal/conf/path.go
@@ -67,8 +67,8 @@ type PathConf struct {
 	// RTSP
 	SourceProtocol      SourceProtocol `json:"sourceProtocol"`
 	SourceAnyPortEnable bool           `json:"sourceAnyPortEnable"`
-	RtspRangeType       RtspRangeType  `json:"rtspRangeType"`
-	RtspRangeStart      string         `json:"rtspRangeStart"`
+	RTSPRangeType       RTSPRangeType  `json:"rtspRangeType"`
+	RTSPRangeStart      string         `json:"rtspRangeStart"`
 
 	// Redirect
 	SourceRedirect string `json:"sourceRedirect"`
diff --git a/internal/conf/rtsp_range_type.go b/internal/conf/rtsp_range_type.go
index a94f1883..6acecd24 100644
--- a/internal/conf/rtsp_range_type.go
+++ b/internal/conf/rtsp_range_type.go
@@ -5,32 +5,32 @@ import (
 	"fmt"
 )
 
-// RtspRangeType is the type used in the Range header.
-type RtspRangeType int
+// RTSPRangeType is the type used in the Range header.
+type RTSPRangeType int
 
 // supported rtsp range types.
 const (
-	RtspRangeTypeUndefined RtspRangeType = iota
-	RtspRangeTypeClock
-	RtspRangeTypeNPT
-	RtspRangeTypeSMPTE
+	RTSPRangeTypeUndefined RTSPRangeType = iota
+	RTSPRangeTypeClock
+	RTSPRangeTypeNPT
+	RTSPRangeTypeSMPTE
 )
 
 // MarshalJSON implements json.Marshaler.
-func (d RtspRangeType) MarshalJSON() ([]byte, error) {
+func (d RTSPRangeType) MarshalJSON() ([]byte, error) {
 	var out string
 
 	switch d {
-	case RtspRangeTypeClock:
+	case RTSPRangeTypeClock:
 		out = "clock"
 
-	case RtspRangeTypeNPT:
+	case RTSPRangeTypeNPT:
 		out = "npt"
 
-	case RtspRangeTypeSMPTE:
+	case RTSPRangeTypeSMPTE:
 		out = "smpte"
 
-	case RtspRangeTypeUndefined:
+	case RTSPRangeTypeUndefined:
 		out = ""
 
 	default:
@@ -41,7 +41,7 @@ func (d RtspRangeType) MarshalJSON() ([]byte, error) {
 }
 
 // UnmarshalJSON implements json.Unmarshaler.
-func (d *RtspRangeType) UnmarshalJSON(b []byte) error {
+func (d *RTSPRangeType) UnmarshalJSON(b []byte) error {
 	var in string
 	if err := json.Unmarshal(b, &in); err != nil {
 		return err
@@ -49,16 +49,16 @@ func (d *RtspRangeType) UnmarshalJSON(b []byte) error {
 
 	switch in {
 	case "clock":
-		*d = RtspRangeTypeClock
+		*d = RTSPRangeTypeClock
 
 	case "npt":
-		*d = RtspRangeTypeNPT
+		*d = RTSPRangeTypeNPT
 
 	case "smpte":
-		*d = RtspRangeTypeSMPTE
+		*d = RTSPRangeTypeSMPTE
 
 	case "":
-		*d = RtspRangeTypeUndefined
+		*d = RTSPRangeTypeUndefined
 
 	default:
 		return fmt.Errorf("invalid rtsp range type: '%s'", in)
@@ -68,6 +68,6 @@ func (d *RtspRangeType) UnmarshalJSON(b []byte) error {
 }
 
 // UnmarshalEnv implements envUnmarshaler.
-func (d *RtspRangeType) UnmarshalEnv(s string) error {
+func (d *RTSPRangeType) UnmarshalEnv(s string) error {
 	return d.UnmarshalJSON([]byte(`"` + s + `"`))
 }
diff --git a/internal/core/rtsp_source.go b/internal/core/rtsp_source.go
index 97bcc0cc..8470b327 100644
--- a/internal/core/rtsp_source.go
+++ b/internal/core/rtsp_source.go
@@ -15,9 +15,9 @@ import (
 )
 
 func createRangeHeader(cnf *conf.PathConf) (*headers.Range, error) {
-	switch cnf.RtspRangeType {
-	case conf.RtspRangeTypeClock:
-		start, err := time.Parse("20060102T150405Z", cnf.RtspRangeStart)
+	switch cnf.RTSPRangeType {
+	case conf.RTSPRangeTypeClock:
+		start, err := time.Parse("20060102T150405Z", cnf.RTSPRangeStart)
 		if err != nil {
 			return nil, err
 		}
@@ -28,8 +28,8 @@ func createRangeHeader(cnf *conf.PathConf) (*headers.Range, error) {
 			},
 		}, nil
 
-	case conf.RtspRangeTypeNPT:
-		start, err := time.ParseDuration(cnf.RtspRangeStart)
+	case conf.RTSPRangeTypeNPT:
+		start, err := time.ParseDuration(cnf.RTSPRangeStart)
 		if err != nil {
 			return nil, err
 		}
@@ -40,8 +40,8 @@ func createRangeHeader(cnf *conf.PathConf) (*headers.Range, error) {
 			},
 		}, nil
 
-	case conf.RtspRangeTypeSMPTE:
-		start, err := time.ParseDuration(cnf.RtspRangeStart)
+	case conf.RTSPRangeTypeSMPTE:
+		start, err := time.ParseDuration(cnf.RTSPRangeStart)
 		if err != nil {
 			return nil, err
 		}