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

fix(sanitize): improve handling for newline tabs etc (#1733)

Browse source 
* fix(sanitize): filter properly \t,,, / etc

* jesus christ.

* bah. probably helps if a human reads the tests.

* k done.

* should be safe now?

* edna?

* real life man
This commit is contained in:
Kyle Sanderson 2024-09-19 07:44:19 -07:00 • committed by GitHub
parent a4452e4fdc
commit e9cd6b0049
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 172 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/domain/filter.go
View file

@ -890,8 +890,8 @@ func containsMatchFuzzy(tags []string, filters []string) bool {
if filter == "" {
continue
}
filter = strings.ToLower(filter)
filter = strings.Trim(filter, " ")
// check if line contains * or ?, if so try wildcard match, otherwise try substring match
a := strings.ContainsAny(filter, "?|*")
if a {
@ -916,15 +916,14 @@ func containsMatch(tags []string, filters []string) bool {
continue
}
tag = strings.ToLower(tag)
tag = strings.Trim(tag, " ")
clear(advanced)
for _, filter := range filters {
if filter == "" {
continue
}
filter = strings.ToLower(filter)
filter = strings.Trim(filter, " ")
// check if line contains * or ?, if so try wildcard match, otherwise try substring match
a := strings.ContainsAny(filter, "?|*")
if a {
@ -948,7 +947,6 @@ func containsAllMatch(tags []string, filters []string) bool {
continue
}
filter = strings.ToLower(filter)
filter = strings.Trim(filter, " ")
found := false
wildFilter := strings.ContainsAny(filter, "?|*")
@ -958,7 +956,6 @@ func containsAllMatch(tags []string, filters []string) bool {
continue
}
tag = strings.ToLower(tag)
tag = strings.Trim(tag, " ")
if tag == filter {
found = true
@ -990,7 +987,6 @@ func containsMatchBasic(tags []string, filters []string) bool {
continue
}
filter = strings.ToLower(filter)
filter = strings.Trim(filter, " ")
if tag == filter {
return true
@ -1008,14 +1004,14 @@ func containsAnySlice(tags []string, filters []string) bool {
continue
}
tag = strings.ToLower(tag)
clear(advanced)
clear(advanced)
for _, filter := range filters {
if filter == "" {
continue
}
filter = strings.ToLower(filter)
filter = strings.Trim(filter, " ")
// check if line contains * or ?, if so try wildcard match, otherwise try substring match
a := strings.ContainsAny(filter, "?|*")
if a {
@ -1038,7 +1034,6 @@ func checkFreeleechPercent(announcePercent int, filterPercent string) bool {
for _, s := range filters {
s = strings.Replace(s, "%", "", -1)
s = strings.Trim(s, " ")
if strings.Contains(s, "-") {
minMax := strings.Split(s, "-")
@ -1085,7 +1080,6 @@ func matchHDR(releaseValues []string, filterValues []string) bool {
continue
}
filter = strings.ToLower(filter)
filter = strings.Trim(filter, " ")
parts := strings.Split(filter, " ")
if len(parts) == 2 {

4
internal/domain/filter_test.go
View file

@ -1914,7 +1914,7 @@ func TestFilter_CheckFilter1(t *testing.T) {
{
name: "test_43",
fields: fields{
Shows: ",Dutchess,Preacher",
Shows: ",Dutchess, preacher",
Seasons: "1",
Episodes: "0",
Resolutions: []string{"2160p"},
@ -1990,6 +1990,8 @@ func TestFilter_CheckFilter1(t *testing.T) {
Indexers: tt.fields.Indexers,
Downloads: tt.fields.Downloads,
}
f.Sanitize()
tt.args.r.ParseString(tt.args.r.TorrentName)
rejections, match := f.CheckFilter(tt.args.r)
assert.Equalf(t, tt.wantRejections, rejections, "CheckFilter(%v)", tt.args.r)