fix regex

This commit is contained in:
Roy Olav Purser 2022-01-15 19:54:59 +01:00
parent 0d49b3e716
commit 0f1586393b
Signed by: roypur
GPG Key ID: E14D26A036F21656

View File

@ -259,7 +259,7 @@ func (c *Config) Status() (ok bool) {
} }
func cleanKey(key string) string { func cleanKey(key string) string {
expr := regexp.MustCompile("__+") expr := regexp.MustCompile("(?:^_+)|(?:_+(?=_))|(?:_$)")
fn := func(r rune) rune { fn := func(r rune) rune {
if (r >= '0' && r <= '9') || (r >= 'A' && r <= 'Z') || r == '_' { if (r >= '0' && r <= '9') || (r >= 'A' && r <= 'Z') || r == '_' {
return r return r
@ -268,7 +268,7 @@ func cleanKey(key string) string {
} }
key = strings.Map(fn, strings.ToUpper(key)) key = strings.Map(fn, strings.ToUpper(key))
return expr.ReplaceAllString(key, "_") return expr.ReplaceAllString(key, "")
} }
func keySplit(key string) (left string, right string, ok bool) { func keySplit(key string) (left string, right string, ok bool) {