api: fix setting default parameters when creating a path (#1853) (#1905)

this fixes a regression introduced in v0.23.0.
bluenviron · Jun 2, 2023 · e2a6c38 · e2a6c38
1 parent f162ce1
commit e2a6c38
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/internal/core/api.go b/internal/core/api.go
@@ -346,6 +346,10 @@ func (a *api) onConfigPathsAdd(ctx *gin.Context) {
  }
 
  newConfPath := &conf.PathConf{}
+
+ // load default values
+ newConfPath.UnmarshalJSON([]byte("{}"))
+
  fillStruct(newConfPath, in)
 
  newConf.Paths[name] = newConfPath

diff --git a/internal/core/api_test.go b/internal/core/api_test.go
@@ -148,10 +148,16 @@ func TestAPIConfigPathsAdd(t *testing.T) {
  "sourceOnDemand": true,
  }, nil)
 
- var out map[string]interface{}
+ var out struct {
+ Paths map[string]struct {
+ Source string `json:"source"`
+ SourceOnDemandStartTimeout string `json:"sourceOnDemandStartTimeout"`
+ } `json:"paths"`
+ }
+
  httpRequest(t, hc, http.MethodGet, "http://localhost:9997/v2/config/get", nil, &out)
- require.Equal(t, "rtsp://127.0.0.1:9999/mypath",
-  out["paths"].(map[string]interface{})["my/path"].(map[string]interface{})["source"])
+ require.Equal(t, "rtsp://127.0.0.1:9999/mypath", out.Paths["my/path"].Source)
+ require.Equal(t, "10s", out.Paths["my/path"].SourceOnDemandStartTimeout)
 }
 
 func TestAPIConfigPathsEdit(t *testing.T) {