Update PUT /api/streams for support multiple src params

internal/homekit/api.go

@@ -101,7 +101,7 @@ func apiPair(id, url string) error {
 		return err
 	}
 
-	streams.New(id, []string{conn.URL()})
+	streams.New(id, conn.URL())
 
 	return app.PatchConfig(id, conn.URL(), "streams")
 }

internal/streams/api.go

@@ -1,7 +1,6 @@
 package streams
 
 import (
-	"encoding/json"
 	"net/http"
 
 	"github.com/AlexxIT/go2rtc/internal/api"
@@ -9,18 +8,13 @@ import (
 	"github.com/AlexxIT/go2rtc/pkg/probe"
 )
 
-func returnAllStreams(w http.ResponseWriter) {
-	api.ResponseJSON(w, streams)
-}
-
 func apiStreams(w http.ResponseWriter, r *http.Request) {
 	query := r.URL.Query()
 	src := query.Get("src")
 
 	// without source - return all streams list
-	// PUT checks first body for sources
+	if src == "" && r.Method != "POST" {
-	if src == "" && r.Method != "POST" && r.Method != "PUT" {
+		api.ResponseJSON(w, streams)
-		returnAllStreams(w)
 		return
 	}
 
@@ -53,31 +47,13 @@ func apiStreams(w http.ResponseWriter, r *http.Request) {
 		if name == "" {
 			name = src
 		}
-		var sources []string
-		if src != "" {
-			sources = []string{src}
-		} else if r.Header.Get("Content-Type") == "application/json" {
-			var data struct {
-				Sources []string `json:"sources"`
-			}
-			if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
-				log.Error().Err(err).Caller().Send()
-				http.Error(w, err.Error(), http.StatusBadRequest)
-				return
-			}
-			sources = data.Sources
-		} else {
-			// without source(s) - return all streams list
-			returnAllStreams(w)
-			return
-		}
 
-		if New(name, sources) == nil {
+		if New(name, query["src"]...) == nil {
 			http.Error(w, "", http.StatusBadRequest)
 			return
 		}
 
-		if err := app.PatchConfig(name, sources, "streams"); err != nil {
+		if err := app.PatchConfig(name, query["src"], "streams"); err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 		}
 

internal/streams/streams.go

@@ -56,7 +56,7 @@ func Validate(source string) error {
 	return nil
 }
 
-func New(name string, sources []string) *Stream {
+func New(name string, sources ...string) *Stream {
 	for _, source := range sources {
 		if Validate(source) != nil {
 			return nil
@@ -107,7 +107,7 @@ func Patch(name string, source string) *Stream {
 	}
 
 	// create new stream with this name
-	return New(name, []string{source})
+	return New(name, source)
 }
 
 func GetOrPatch(query url.Values) *Stream {