peter/ekster
1
0
Fork 0
Code Issues 3 Pull Requests Projects 3 Releases 1 Wiki Activity

Simplify matching of inclusion/exclusion regex
All checks were successful
the build was successful
Details

Browse Source
This commit is contained in:
Peter Stuifzand 2018-08-18 20:57:43 +02:00
parent 8360c178c7
commit 118b072f38
Signed by: peter
GPG Key ID: 374322D56E5209E8
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
cmd/eksterd/memory.go
View File

@ -653,20 +653,13 @@ func (b *memoryBackend) channelAddItemWithMatcher(conn redis.Conn, channel strin
var updatedChannels []string var updatedChannels []string
for channelKey, setting := range b.Settings { for channelKey, setting := range b.Settings {
if setting.IncludeRegex != "" { if setting.IncludeRegex != "" {
included := false re, err := regexp.Compile(setting.IncludeRegex)
includeRegex, err := regexp.Compile(setting.IncludeRegex)
if err != nil { if err != nil {
log.Printf("error in regexp: %q\n", includeRegex) log.Printf("error in regexp: %q, %s\n", setting.IncludeRegex, err)
} else { return nil
included = matchItemText(item, includeRegex)
for _, v := range item.Refs {
included = included || matchItemText(v, includeRegex)
}
} }
if included { if matchItem(item, re) {
log.Printf("Included %#v\n", item) log.Printf("Included %#v\n", item)
b.channelAddItem(conn, channelKey, item) b.channelAddItem(conn, channelKey, item)
updatedChannels = append(updatedChannels, channelKey) updatedChannels = append(updatedChannels, channelKey)
@ -685,21 +678,11 @@ func (b *memoryBackend) channelAddItemWithMatcher(conn redis.Conn, channel strin
excludeRegex, err := regexp.Compile(setting.ExcludeRegex) excludeRegex, err := regexp.Compile(setting.ExcludeRegex)
if err != nil { if err != nil {
log.Printf("error in regexp: %q\n", excludeRegex) log.Printf("error in regexp: %q\n", excludeRegex)
} else { return nil
if item.Content != nil { }
if excludeRegex.MatchString(item.Content.Text) { if matchItem(item, excludeRegex) {
log.Printf("Excluded %#v\n", item) log.Printf("Excluded %#v\n", item)
return nil return nil
}
if excludeRegex.MatchString(item.Content.HTML) {
log.Printf("Excluded %#v\n", item)
return nil
}
}
if excludeRegex.MatchString(item.Name) {
log.Printf("Excluded %#v\n", item)
return nil
}
} }
} }
} }
@ -707,12 +690,30 @@ func (b *memoryBackend) channelAddItemWithMatcher(conn redis.Conn, channel strin
return b.channelAddItem(conn, channel, item) return b.channelAddItem(conn, channel, item)
} }
func matchItemText(item microsub.Item, includeRegex *regexp.Regexp) bool { func matchItem(item microsub.Item, re *regexp.Regexp) bool {
var included bool if matchItemText(item, re) {
if item.Content != nil { return true
included = includeRegex.MatchString(item.Content.Text) || includeRegex.MatchString(item.Content.HTML)
} }
return included || includeRegex.MatchString(item.Name)
for _, v := range item.Refs {
if matchItemText(v, re) {
return true
}
}
return false
}
func matchItemText(item microsub.Item, re *regexp.Regexp) bool {
if item.Content != nil {
if re.MatchString(item.Content.Text) {
return true
}
if re.MatchString(item.Content.HTML) {
return true
}
}
return re.MatchString(item.Name)
} }
func (b *memoryBackend) channelAddItem(conn redis.Conn, channel string, item microsub.Item) error { func (b *memoryBackend) channelAddItem(conn redis.Conn, channel string, item microsub.Item) error {