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(filters): contains check empty (#273)

Browse source
This commit is contained in:
Ludvig Lundgren 2022-05-17 07:31:31 +02:00 • committed by GitHub
parent cb8f280e86
commit 45053d9823
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

24
internal/domain/filter.go
View file

@ -320,9 +320,15 @@ func (f Filter) checkSizeFilter(r *Release, minSize string, maxSize string) bool
} }
func matchRegex(tag string, filterList string) bool { func matchRegex(tag string, filterList string) bool {
if tag == "" {
return false
}
filters := strings.Split(filterList, ",") filters := strings.Split(filterList, ",")
for _, filter := range filters { for _, filter := range filters {
if filter == "" {
continue
}
re, err := regexp.Compile(`(?i)(?:` + filter + `)`) re, err := regexp.Compile(`(?i)(?:` + filter + `)`)
if err != nil { if err != nil {
return false return false
@ -427,9 +433,15 @@ func containsMatchFuzzy(tags []string, filters []string) bool {
func containsMatch(tags []string, filters []string) bool { func containsMatch(tags []string, filters []string) bool {
for _, tag := range tags { for _, tag := range tags {
if tag == "" {
continue
}
tag = strings.ToLower(tag) tag = strings.ToLower(tag)
for _, filter := range filters { for _, filter := range filters {
if filter == "" {
continue
}
filter = strings.ToLower(filter) filter = strings.ToLower(filter)
filter = strings.Trim(filter, " ") filter = strings.Trim(filter, " ")
// check if line contains * or ?, if so try wildcard match, otherwise try substring match // check if line contains * or ?, if so try wildcard match, otherwise try substring match
@ -450,9 +462,15 @@ func containsMatch(tags []string, filters []string) bool {
func containsMatchBasic(tags []string, filters []string) bool { func containsMatchBasic(tags []string, filters []string) bool {
for _, tag := range tags { for _, tag := range tags {
if tag == "" {
continue
}
tag = strings.ToLower(tag) tag = strings.ToLower(tag)
for _, filter := range filters { for _, filter := range filters {
if filter == "" {
continue
}
filter = strings.ToLower(filter) filter = strings.ToLower(filter)
filter = strings.Trim(filter, " ") filter = strings.Trim(filter, " ")
@ -467,9 +485,15 @@ func containsMatchBasic(tags []string, filters []string) bool {
func containsAnySlice(tags []string, filters []string) bool { func containsAnySlice(tags []string, filters []string) bool {
for _, tag := range tags { for _, tag := range tags {
if tag == "" {
continue
}
tag = strings.ToLower(tag) tag = strings.ToLower(tag)
for _, filter := range filters { for _, filter := range filters {
if filter == "" {
continue
}
filter = strings.ToLower(filter) filter = strings.ToLower(filter)
filter = strings.Trim(filter, " ") filter = strings.Trim(filter, " ")
// check if line contains * or ?, if so try wildcard match, otherwise try substring match // check if line contains * or ?, if so try wildcard match, otherwise try substring match

8
internal/domain/filter_test.go
View file

@ -1490,6 +1490,8 @@ func Test_contains(t *testing.T) {
{name: "test_5", args: args{tag: "something.test.something", filter: "*test*"}, want: true}, {name: "test_5", args: args{tag: "something.test.something", filter: "*test*"}, want: true},
{name: "test_6", args: args{tag: "that movie", filter: "that?movie"}, want: true}, {name: "test_6", args: args{tag: "that movie", filter: "that?movie"}, want: true},
{name: "test_7", args: args{tag: "that.movie", filter: "that?movie"}, want: true}, {name: "test_7", args: args{tag: "that.movie", filter: "that?movie"}, want: true},
{name: "test_8", args: args{tag: "", filter: "that?movie,"}, want: false},
{name: "test_9", args: args{tag: "", filter: ""}, want: false},
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
@ -1511,6 +1513,7 @@ func Test_containsSlice(t *testing.T) {
{name: "test_1", args: args{tag: "group1", filters: []string{"group1", "group2"}}, want: true}, {name: "test_1", args: args{tag: "group1", filters: []string{"group1", "group2"}}, want: true},
{name: "test_2", args: args{tag: "group1", filters: []string{"group2", "group3"}}, want: false}, {name: "test_2", args: args{tag: "group1", filters: []string{"group2", "group3"}}, want: false},
{name: "test_3", args: args{tag: "2160p", filters: []string{"1080p", "2160p"}}, want: true}, {name: "test_3", args: args{tag: "2160p", filters: []string{"1080p", "2160p"}}, want: true},
{name: "test_4", args: args{tag: "", filters: []string{""}}, want: false},
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
@ -1531,6 +1534,7 @@ func Test_containsAny(t *testing.T) {
}{ }{
{name: "test_1", args: args{tags: []string{"HDR", "DV"}, filter: "DV"}, want: true}, {name: "test_1", args: args{tags: []string{"HDR", "DV"}, filter: "DV"}, want: true},
{name: "test_2", args: args{tags: []string{"HDR"}, filter: "DV"}, want: false}, {name: "test_2", args: args{tags: []string{"HDR"}, filter: "DV"}, want: false},
{name: "test_3", args: args{tags: []string{""}, filter: "test,"}, want: false},
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
@ -1551,6 +1555,9 @@ func Test_sliceContainsSlice(t *testing.T) {
}{ }{
{name: "test_1", args: args{tags: []string{"HDR", "DV"}, filters: []string{"HDR", "DoVi"}}, want: true}, {name: "test_1", args: args{tags: []string{"HDR", "DV"}, filters: []string{"HDR", "DoVi"}}, want: true},
{name: "test_2", args: args{tags: []string{"HDR10+", "DV"}, filters: []string{"HDR"}}, want: false}, {name: "test_2", args: args{tags: []string{"HDR10+", "DV"}, filters: []string{"HDR"}}, want: false},
{name: "test_3", args: args{tags: []string{""}, filters: []string{"test,"}}, want: false},
{name: "test_4", args: args{tags: []string{""}, filters: []string{","}}, want: false},
{name: "test_5", args: args{tags: []string{""}, filters: []string{""}}, want: false},
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
@ -1600,6 +1607,7 @@ func Test_matchRegex(t *testing.T) {
{name: "test_2", args: args{tag: "Some.show.S01.DV.2160p.ATVP.WEB-DL.DDPA5.1.x265-GROUP2", filter: ".*1080p.+(group1|group3)"}, want: false}, {name: "test_2", args: args{tag: "Some.show.S01.DV.2160p.ATVP.WEB-DL.DDPA5.1.x265-GROUP2", filter: ".*1080p.+(group1|group3)"}, want: false},
{name: "test_3", args: args{tag: "Some.show.S01.DV.2160p.ATVP.WEB-DL.DDPA5.1.x265-GROUP2", filter: ".*1080p.+(group1|group3),.*2160p.+"}, want: true}, {name: "test_3", args: args{tag: "Some.show.S01.DV.2160p.ATVP.WEB-DL.DDPA5.1.x265-GROUP2", filter: ".*1080p.+(group1|group3),.*2160p.+"}, want: true},
{name: "test_4", args: args{tag: "Some.show.S01.DV.2160p.ATVP.WEB-DL.DDPA5.1.x265-GROUP2", filter: ".*1080p.+(group1|group3),.*720p.+"}, want: false}, {name: "test_4", args: args{tag: "Some.show.S01.DV.2160p.ATVP.WEB-DL.DDPA5.1.x265-GROUP2", filter: ".*1080p.+(group1|group3),.*720p.+"}, want: false},
{name: "test_5", args: args{tag: "Some.show.S01.DV.2160p.ATVP.WEB-DL.DDPA5.1.x265-GROUP2", filter: ".*1080p.+(group1|group3),.*720p.+,"}, want: false},
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {