Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 12:24:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use case-insensitive matching in nameMatchesPath (#2378)

Browse Source 
* Use case-insensitive matching in nameMatchesPath

Also ensures that only unique words are returned in getPathWords.
This commit is contained in:
WithoutPants
2022-03-11 09:35:48 +11:00
committed by GitHub
parent 7bd47c651c
commit e4d6d3b085
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/match/path.go
View File

@@ -11,6 +11,7 @@ import (
"github.com/stashapp/stash/pkg/image"
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/scene"
"github.com/stashapp/stash/pkg/utils"
)
const (
@@ -62,7 +63,7 @@ func getPathWords(path string) []string {
// just use the first two characters
// #2293 - need to convert to unicode runes for the substring, otherwise
// the resulting string is corrupted.
ret = append(ret, string([]rune(w)[0:2]))
ret = utils.StrAppendUnique(ret, string([]rune(w)[0:2]))
}
}
@@ -85,13 +86,7 @@ func nameMatchesPath(name, path string) int {
// #2363 - optimisation: only use unicode character regexp if path contains
// unicode characters
re := nameToRegexp(name, !allASCII(path))
found := re.FindAllStringIndex(path, -1)
if found == nil {
return -1
}
return found[len(found)-1][0]
return regexpMatchesPath(re, path)
}
// nameToRegexp compiles a regexp pattern to match paths from the given name.