Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2026-05-09 05:05:29 +02:00
Code Issues Projects Releases Wiki Activity

Split by whitespace for path includes/excludes (#2919)

Browse source
This commit is contained in:
WithoutPants 2022-09-16 14:45:08 +10:00 committed by GitHub
parent 90726086e5
commit 648247aa00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
pkg/sqlite/filter.go
View file

@ -34,7 +34,7 @@ func makeClause(sql string, args ...interface{}) sqlClause {
}
}
func orClauses(clauses ...sqlClause) sqlClause {
func joinClauses(joinType string, clauses ...sqlClause) sqlClause {
var ret []string
var args []interface{}
@ -43,7 +43,15 @@ func orClauses(clauses ...sqlClause) sqlClause {
args = append(args, clause.args...)
}
return sqlClause{sql: strings.Join(ret, " OR "), args: args}
return sqlClause{sql: strings.Join(ret, " "+joinType+" "), args: args}
}
func orClauses(clauses ...sqlClause) sqlClause {
return joinClauses("OR", clauses...)
}
func andClauses(clauses ...sqlClause) sqlClause {
return joinClauses("AND", clauses...)
}
type criterionHandler interface {
@ -430,10 +438,10 @@ func pathCriterionHandler(c *models.StringCriterionInput, pathColumn string, bas
if modifier := c.Modifier; c.Modifier.IsValid() {
switch modifier {
case models.CriterionModifierIncludes:
f.whereClauses = append(f.whereClauses, getPathSearchClause(pathColumn, basenameColumn, c.Value, addWildcards, not))
f.whereClauses = append(f.whereClauses, getPathSearchClauseMany(pathColumn, basenameColumn, c.Value, addWildcards, not))
case models.CriterionModifierExcludes:
not = true
f.whereClauses = append(f.whereClauses, getPathSearchClause(pathColumn, basenameColumn, c.Value, addWildcards, not))
f.whereClauses = append(f.whereClauses, getPathSearchClauseMany(pathColumn, basenameColumn, c.Value, addWildcards, not))
case models.CriterionModifierEquals:
addWildcards = false
f.whereClauses = append(f.whereClauses, getPathSearchClause(pathColumn, basenameColumn, c.Value, addWildcards, not))
@ -514,6 +522,32 @@ func getPathSearchClause(pathColumn, basenameColumn, p string, addWildcards, not
return ret
}
// getPathSearchClauseMany splits the query string p on whitespace
// Used for backwards compatibility for the includes/excludes modifiers
func getPathSearchClauseMany(pathColumn, basenameColumn, p string, addWildcards, not bool) sqlClause {
q := strings.TrimSpace(p)
trimmedQuery := strings.Trim(q, "\"")
if trimmedQuery == q {
q = regexp.MustCompile(`\s+`).ReplaceAllString(q, " ")
queryWords := strings.Split(q, " ")
var ret []sqlClause
// Search for any word
for _, word := range queryWords {
ret = append(ret, getPathSearchClause(pathColumn, basenameColumn, word, addWildcards, not))
}
if !not {
return orClauses(ret...)
}
return andClauses(ret...)
}
return getPathSearchClause(pathColumn, basenameColumn, trimmedQuery, addWildcards, not)
}
func intCriterionHandler(c *models.IntCriterionInput, column string, addJoinFn func(f *filterBuilder)) criterionHandlerFunc {
return func(ctx context.Context, f *filterBuilder) {
if c != nil {