kodev-org
/
vikunja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: extract preprocessFilterString from task filter parsing

This commit is contained in:
kolaente 2026-06-08 15:10:55 +02:00 committed by kolaente
parent 6387d8138a
commit 26c067cc38
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/models/task_collection_filter.go
View File

@ -170,20 +170,16 @@ func parseFilterFromExpression(f fexpr.ExprGroup, loc *time.Location) (filter *t
return filter, nil
}
func getTaskFiltersFromFilterString(filter string, filterTimezone string) (filters []*taskFilter, err error) {
if filter == "" {
return
}
// preprocessFilterString rewrites the human filter syntax (in / not in / like)
// into fexpr sigils and quotes bare values so fexpr.Parse accepts them. Shared
// by every entity that filters with the task grammar.
func preprocessFilterString(filter string) string {
filter = strings.ReplaceAll(filter, " not in ", " "+string(fexpr.SignAnyNeq)+" ")
filter = strings.ReplaceAll(filter, " in ", " ?= ")
filter = strings.ReplaceAll(filter, " like ", " ~ ")
// Regex pattern to match filter expressions
re := regexp.MustCompile(`(\w+)\s*(>=|<=|!=|~|\?=|\?!=|=|>|<)\s*([^&|()]+)`)
filter = re.ReplaceAllStringFunc(filter, func(match string) string {
return re.ReplaceAllStringFunc(filter, func(match string) string {
parts := re.FindStringSubmatch(match)
if len(parts) != 4 {
return match
@ -193,16 +189,24 @@ func getTaskFiltersFromFilterString(filter string, filterTimezone string) (filte
comparator := parts[2]
value := strings.TrimSpace(parts[3])
// Check if the value is already quoted
// Already quoted — leave as-is
if (strings.HasPrefix(value, "'") && strings.HasSuffix(value, "'")) ||
(strings.HasPrefix(value, "\"") && strings.HasSuffix(value, "\"")) {
return field + " " + comparator + " " + value
}
// Quote the value
quotedValue := "'" + strings.ReplaceAll(value, "'", "\\'") + "'"
return field + " " + comparator + " " + quotedValue
})
}
func getTaskFiltersFromFilterString(filter string, filterTimezone string) (filters []*taskFilter, err error) {
if filter == "" {
return
}
filter = preprocessFilterString(filter)
parsedFilter, err := fexpr.Parse(filter)
if err != nil {