apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-09-26 20:11:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix placeholder parsing

Browse Source
This commit is contained in:
Ingo Oppermann
2024-03-14 12:03:04 +01:00
parent ccd9a5fbc1
commit bfe53a2461
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
restream/replace/replace.go
View File

@@ -51,7 +51,7 @@ type replacer struct {
func New() Replacer { func New() Replacer {
r := &replacer{ r := &replacer{
templates: make(map[string]template), templates: make(map[string]template),
re: regexp.MustCompile(`{([a-z:]+)(?:\^(.))?(?:,(.*?))?}`), re: regexp.MustCompile(`{([a-z]+(?::[0-9A-Za-z]+)?)(?:\^(.))?(?:,(.*?))?}`),
templateRe: regexp.MustCompile(`{([a-z:]+)}`), templateRe: regexp.MustCompile(`{([a-z:]+)}`),
} }

5
restream/replace/replace_test.go
View File

@@ -138,7 +138,8 @@ func TestReplaceGlob(t *testing.T) {
r := New() r := New()
r.RegisterTemplate("foo:bar", "Hello foobar", nil) r.RegisterTemplate("foo:bar", "Hello foobar", nil)
r.RegisterTemplate("foo:baz", "Hello foobaz", nil) r.RegisterTemplate("foo:baz", "Hello foobaz", nil)
r.RegisterTemplate("foo:123", "Hello 456", nil)
replaced := r.Replace("{foo:baz}, {foo:bar}", "foo:*", "", nil, nil, "") replaced := r.Replace("{foo:baz}, {foo:bar}, {foo:123}", "foo:*", "", nil, nil, "")
require.Equal(t, "Hello foobaz, Hello foobar", replaced) require.Equal(t, "Hello foobaz, Hello foobar, Hello 456", replaced)
} }