zgaetano/datarhei-dragonfork-core
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 4 Packages Wiki Activity Actions

Fix placeholder parsing

Browse source
This commit is contained in:
Ingo Oppermann 2024-03-14 12:03:04 +01:00
parent ccd9a5fbc1
commit bfe53a2461
No known key found for this signature in database
GPG key ID: 2AB32426E9DD229E
2 changed files with 4 additions and 3 deletions
Show stats 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 {
r := &replacer{
templates: make(map[string]template),
re: regexp.MustCompile(`{([a-z:]+)(?:\^(.))?(?:,(.*?))?}`),
re: regexp.MustCompile(`{([a-z]+(?::[0-9A-Za-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.RegisterTemplate("foo:bar", "Hello foobar", 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, "")
require.Equal(t, "Hello foobaz, Hello foobar", replaced)
replaced := r.Replace("{foo:baz}, {foo:bar}, {foo:123}", "foo:*", "", nil, nil, "")
require.Equal(t, "Hello foobaz, Hello foobar, Hello 456", replaced)
}