idanoo/autobrr
1
0
Fork 0
mirror of https://github.com/idanoo/autobrr synced 2025-07-23 16:59:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(wildcard): match on multi-line data (#1780)

Browse source 
* fix(wildcard): match on multi-line data

* fix(wildcard): remove duplicate block
This commit is contained in:
ze0s 2024-10-23 16:33:49 +02:00 • committed by GitHub
parent f029de233f
commit 8cd7d67cee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

26
pkg/wildcard/match.go
View file

@ -8,6 +8,7 @@ import (
"strings" "strings"
"github.com/autobrr/autobrr/pkg/regexcache" "github.com/autobrr/autobrr/pkg/regexcache"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
@ -29,22 +30,26 @@ func Match(pattern, name string) (matched bool) {
func match(pattern, name string, simple bool) (matched bool) { func match(pattern, name string, simple bool) (matched bool) {
if pattern == "" { // if pattern == "" { //
return name == "" return name == ""
} else if pattern == "*" { // * } else if pattern == "*" { // *
return true return true
} else if !simple && pattern == "?" { // ? } else if !simple && pattern == "?" { // ?
return len(name) == 1 return len(name) == 1
} else if idx := strings.IndexAny(pattern, "*?"); idx == -1 || (simple && pattern[idx] == '?' && !strings.Contains(pattern, "*")) { // egg } else if idx := strings.IndexAny(pattern, "*?"); idx == -1 || (simple && pattern[idx] == '?' && !strings.Contains(pattern, "*")) { // egg
return name == pattern return name == pattern
} else if idx == len(pattern)-1 && pattern[idx] == '*' { // egg* } else if idx == len(pattern)-1 && pattern[idx] == '*' { // egg*
return strings.HasPrefix(name, pattern[:idx-1]) return strings.HasPrefix(name, pattern[:idx-1])
} else if wildEnd := pattern[len(pattern)-1] == '*'; !simple &&
((wildEnd && strings.Count(pattern, "*") == 1) || // egg?bert*
(len(pattern) == len(name) && !strings.Contains(pattern, "*"))) { // egg?bert?
// egg?bert*
} else if wildEnd := pattern[len(pattern)-1] == '*'; !simple && ((wildEnd && strings.Count(pattern, "*") == 1) || (len(pattern) == len(name) && !strings.Contains(pattern, "*"))) { // egg?bert?
return matchComplex(name, pattern, wildEnd) return matchComplex(name, pattern, wildEnd)
} else if strings.HasPrefix(pattern, "*") && strings.HasSuffix(pattern, "*") && // *egg*
(simple || (!simple && !strings.Contains(pattern, "?"))) && // simple is fine, if not we need to check for ? and skip if so. // *egg*
strings.Count(pattern, "*") == 2 { // make sure that we have no other wildcards. // simple is fine, if not we need to check for ? and skip if so.
} else if strings.HasPrefix(pattern, "*") && strings.HasSuffix(pattern, "*") && (simple || (!simple && !strings.Contains(pattern, "?"))) && strings.Count(pattern, "*") == 2 { // make sure that we have no other wildcards.
return strings.Contains(name, pattern[1:len(pattern)-1]) return strings.Contains(name, pattern[1:len(pattern)-1])
} }
@ -146,7 +151,7 @@ func cleanForRegex(pattern string, simple bool) string {
} }
func prepForRegex(pattern string) string { func prepForRegex(pattern string) string {
return `^` + regexp.QuoteMeta(pattern) + `$` return `(?m)^` + regexp.QuoteMeta(pattern) + `$`
} }
func deepMatchRune(str, pattern string, simple bool, original string, bulk bool) bool { func deepMatchRune(str, pattern string, simple bool, original string, bulk bool) bool {
@ -174,10 +179,5 @@ func deepMatchRune(str, pattern string, simple bool, original string, bulk bool)
regexcache.SubmitOriginal(original+salt, user) regexcache.SubmitOriginal(original+salt, user)
} }
idx := user.FindStringIndex(str) return user.MatchString(str)
if idx == nil {
return false
}
return idx[1] == len(str)
} }

24
pkg/wildcard/match_test.go
View file

@ -4,7 +4,10 @@
package wildcard package wildcard
import ( import (
"fmt"
"testing" "testing"
"github.com/stretchr/testify/assert"
) )
// TestMatch - Tests validate the logic of wild card matching. // TestMatch - Tests validate the logic of wild card matching.
@ -12,7 +15,7 @@ import (
// A '*' in a provided string will not result in matching the strings before and after the '*' of the string provided. // A '*' in a provided string will not result in matching the strings before and after the '*' of the string provided.
// Sample usage: In resource matching for bucket policy validation. // Sample usage: In resource matching for bucket policy validation.
func TestMatch(t *testing.T) { func TestMatch(t *testing.T) {
testCases := []struct { tests := []struct {
pattern string pattern string
text string text string
matched bool matched bool
@ -69,7 +72,7 @@ func TestMatch(t *testing.T) {
}, },
{ {
pattern: "*EP?B*", pattern: "*EP?B*",
text: "Translated (Group) / EPUB", text: "ARG THIS IS A STUPID LONG ONG LONG LONG STRING BEFORE AND AFTER \\n ARG THIS IS A STUPID LONG ONG LONG LONG STRING BEFORE AND AFTER \\n ARG THIS IS A STUPID LONG ONG LONG LONG STRING BEFORE AND AFTER \\n ARG THIS IS A STUPID LONG ONG LONG LONG STRING BEFORE AND AFTER \\n Translated (Group) / EPUB WITH OTHER STUFF ON THE OTHER END ARG THIS IS A STUPID LONG ONG LONG LONG STRING BEFORE AND AFTER \\n ARG THIS IS A STUPID LONG ONG LONG LONG STRING BEFORE AND AFTER \\n ARG THIS IS A STUPID LONG ONG LONG LONG STRING BEFORE AND AFTER \\n ",
matched: true, matched: true,
}, },
{ {
@ -127,13 +130,18 @@ func TestMatch(t *testing.T) {
text: "T?Q", text: "T?Q",
matched: true, matched: true,
}, },
{
pattern: "*black?metal*",
text: " || Artist......: Vredehammer ||\n || Album.......: Mintaka ||\n || Year........: 2013 ||\n || ||\n || Genre.......: black metal ||\n || Label.......: Indie Recordings ||\n || ||\n || Source......: FLAC/WEB (16bit) ||\n || Encoder.....: libFLAC ||\n || Bitrate.....: 948 kbps avg. ||\n || F.Rate......: 44.1kHz ||\n || ||\n || Playtime....: 00:19:27 / 138.70MB ||\n || R.Date......: 2024-10-22 ||\n || S.Date......: 2013-03-27 ||\n || ||\n || ||\n || 01. The King Has Risen 3:53 ||\n || 02. H├╕ster av sjeler 4:17 ||\n || 03. Mintaka 4:10 ||\n || 04. Ditt siste aandedrag 7:07 ||\n || ||\n || ||\n || Vredehammer combines aggressive guitars and Norse melodies. ||\n ",
matched: true,
},
} }
// Iterating over the test cases, call the function under test and assert the output. for idx, tt := range tests {
for i, testCase := range testCases { t.Run(fmt.Sprintf("match: %d", idx), func(t *testing.T) {
actualResult := Match(testCase.pattern, testCase.text) actualResult := Match(tt.pattern, tt.text)
if testCase.matched != actualResult { assert.Equal(t, tt.matched, actualResult)
t.Errorf("Test %d: Expected the result to be `%v`, but instead found it to be `%v`", i+1, testCase.matched, actualResult)
} })
} }
} }