Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2026-04-21 14:34:16 +02:00
Code Issues Projects Releases Wiki Activity

True case insensitive regex support (#2314)

Browse source
This commit is contained in:
DampToast 2022-02-15 18:34:08 -06:00 committed by GitHub
parent 4dd0bbc294
commit de2724abb9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkg/manager/exclude_files.go
View file

@ -38,7 +38,7 @@ func excludeFiles(files []string, patterns []string) ([]string, int) {
func matchFileRegex(file string, fileRegexps []*regexp.Regexp) bool {
for _, regPattern := range fileRegexps {
if regPattern.MatchString(strings.ToLower(file)) {
if regPattern.MatchString(file) {
return true
}
}
@ -60,7 +60,10 @@ func generateRegexps(patterns []string) []*regexp.Regexp {
var fileRegexps []*regexp.Regexp
for _, pattern := range patterns {
reg, err := regexp.Compile(strings.ToLower(pattern))
if !strings.HasPrefix(pattern, "(?i)") {
pattern = "(?i)" + pattern
}
reg, err := regexp.Compile(pattern)
if err != nil {
logger.Errorf("Exclude :%v", err)
} else {
@ -78,7 +81,7 @@ func generateRegexps(patterns []string) []*regexp.Regexp {
func matchFileSimple(file string, regExps []*regexp.Regexp) bool {
for _, regPattern := range regExps {
if regPattern.MatchString(strings.ToLower(file)) {
if regPattern.MatchString(file) {
return true
}
}

8
pkg/manager/exclude_files_test.go
View file

@ -26,7 +26,9 @@ var excludeTestFilenames = []string{
"\\\\network\\videos\\filename windows network.mp4",
"\\\\network\\share\\windows network wanted.mp4",
"\\\\network\\share\\windows network wanted sample.mp4",
"\\\\network\\private\\windows.network.skip.mp4"}
"\\\\network\\private\\windows.network.skip.mp4",
"/stash/videos/a5.mp4",
"/stash/videos/mIxEdCaSe.mp4"}
var excludeTests = []struct {
testPattern []string
@ -42,6 +44,10 @@ var excludeTests = []struct {
{[]string{"^\\\\\\\\network"}, 4}, // windows net share
{[]string{"\\\\private\\\\"}, 1}, // windows net share
{[]string{"\\\\private\\\\", "sample\\.mp4"}, 3}, // windows net share
{[]string{"\\D\\d\\.mp4"}, 1}, // validates that \D doesn't get converted to lowercase \d
{[]string{"mixedcase\\.mp4"}, 1}, // validates we can match the mixed case file
{[]string{"MIXEDCASE\\.mp4"}, 1}, // validates we can match the mixed case file
{[]string{"(?i)MIXEDCASE\\.mp4"}, 1}, // validates we can match the mixed case file without adding another (?i) to it
}
func TestExcludeFiles(t *testing.T) {