Skip to content

Commit

Permalink
improve filters interface
Browse files Browse the repository at this point in the history
  • Loading branch information
orsinium authored and muesli committed Oct 10, 2020
1 parent 173471d commit 62cc3c1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 19 deletions.
2 changes: 1 addition & 1 deletion filters/filters.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ type FilterInterface interface {
Description() string

// Execute the filter
Passes(data interface{}, value interface{}) bool
Passes(data map[string]interface{}, value string) bool
}

var (
Expand Down
31 changes: 13 additions & 18 deletions filters/template/templatefilter.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,28 +45,23 @@ func (filter *TemplateFilter) Description() string {
}

// Passes returns true when the Filter matched the data.
func (filter *TemplateFilter) Passes(data interface{}, value interface{}) bool {
switch v := value.(type) {
case string:
var res bytes.Buffer
func (filter *TemplateFilter) Passes(data map[string]interface{}, v string) bool {
var res bytes.Buffer

if strings.Index(v, "{{test") >= 0 {
v = strings.Replace(v, "{{test", "{{if", -1)
v += "true{{end}}"
}

tmpl, err := template.New("_" + v).Funcs(templatehelper.FuncMap).Parse(v)
if err == nil {
err = tmpl.Execute(&res, data)
}
if err != nil {
panic(err)
}
if strings.Contains(v, "{{test") {
v = strings.Replace(v, "{{test", "{{if", -1)
v += "true{{end}}"
}

return strings.TrimSpace(res.String()) == "true"
tmpl, err := template.New("_" + v).Funcs(templatehelper.FuncMap).Parse(v)
if err == nil {
err = tmpl.Execute(&res, data)
}
if err != nil {
panic(err)
}

return false
return strings.TrimSpace(res.String()) == "true"
}

func init() {
Expand Down

0 comments on commit 62cc3c1

Please sign in to comment.