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

fix(filters): multi-single value dynamic range matching (#2033)

Browse source
This commit is contained in:
ze0s 2025-05-01 15:08:37 +02:00 • committed by GitHub
parent 7c5f5ac9fd
commit a0dfe89032
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 98 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
internal/domain/filter.go
View file

@ -504,11 +504,11 @@ func (f *Filter) CheckFilter(r *Release) (*RejectionReasons, bool) {
}
if len(f.MatchHDR) > 0 && !matchHDR(r.HDR, f.MatchHDR) {
f.RejectReasons.Add("match hdr", r.HDR, f.MatchHDR)
f.RejectReasons.Add("match hdr", strings.Join(r.HDR, " "), f.MatchHDR)
}
if len(f.ExceptHDR) > 0 && matchHDR(r.HDR, f.ExceptHDR) {
f.RejectReasons.Add("except hdr", r.HDR, f.ExceptHDR)
f.RejectReasons.Add("except hdr", strings.Join(r.HDR, " "), f.ExceptHDR)
}
// Other is parsed into the Other slice from rls
@ -1168,6 +1168,7 @@ func matchHDR(releaseValues []string, filterValues []string) bool {
filter = strings.TrimSpace(filter)
filter = strings.ToLower(filter)
// for filter with dual tag like "DV HDR"
parts := strings.Split(filter, " ")
if len(parts) == 2 {
partsMatched := 0
@ -1186,14 +1187,31 @@ func matchHDR(releaseValues []string, filterValues []string) bool {
}
}
} else {
for _, tag := range releaseValues {
if tag == "" {
continue
matches := 0
if len(releaseValues) == 2 {
for _, tag := range releaseValues {
if tag == "" {
continue
}
tag = strings.ToLower(tag)
if tag == filter {
matches++
}
}
tag = strings.ToLower(tag)
if tag == filter {
if matches == len(releaseValues) {
return true
}
} else {
for _, tag := range releaseValues {
if tag == "" {
continue
}
tag = strings.ToLower(tag)
if tag == filter {
return true
}
}
}
}
}

82
internal/domain/filter_test.go
View file

@ -976,7 +976,7 @@ func TestFilter_CheckFilter(t *testing.T) {
ExceptReleases: "NORDiC",
ExceptHDR: []string{"DV", "HDR", "DoVi"},
},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "except hdr", got: []string{"DV"}, want: []string{"DV", "HDR", "DoVi"}}}},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "except hdr", got: "DV", want: []string{"DV", "HDR", "DoVi"}}}},
},
want: false,
},
@ -998,7 +998,7 @@ func TestFilter_CheckFilter(t *testing.T) {
ExceptReleases: "NORDiC",
MatchHDR: []string{"DV", "HDR", "DoVi"},
},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "match hdr", got: []string(nil), want: []string{"DV", "HDR", "DoVi"}}}},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "match hdr", got: "", want: []string{"DV", "HDR", "DoVi"}}}},
},
want: false,
},
@ -1114,7 +1114,7 @@ func TestFilter_CheckFilter(t *testing.T) {
Enabled: true,
MatchHDR: []string{"DV HDR"},
},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "match hdr", got: []string{"DV", "HDR10"}, want: []string{"DV HDR"}}}},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "match hdr", got: "DV HDR10", want: []string{"DV HDR"}}}},
},
want: false,
},
@ -1128,7 +1128,71 @@ func TestFilter_CheckFilter(t *testing.T) {
Enabled: true,
MatchHDR: []string{"DV", "HDR"},
},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "match hdr", got: []string{"HDR10"}, want: []string{"DV", "HDR"}}}},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "match hdr", got: "HDR10", want: []string{"DV", "HDR"}}}},
},
want: false,
},
{
name: "match_hdr_12",
fields: &Release{
TorrentName: "Good show shift S02 2160p ATVP WEB-DL DDP 5.1 Atmos DV HDR HEVC-GROUP",
Category: "TV",
Uploader: "Uploader1",
},
args: args{
filter: Filter{
Enabled: true,
ExceptHDR: []string{"DV"},
},
rejectionReasons: &RejectionReasons{data: []Rejection{}},
},
want: true,
},
{
name: "match_hdr_13",
fields: &Release{
TorrentName: "Good show shift S02 2160p ATVP WEB-DL DDP 5.1 Atmos DV HDR HEVC-GROUP",
Category: "TV",
Uploader: "Uploader1",
},
args: args{
filter: Filter{
Enabled: true,
ExceptHDR: []string{"DV HDR"},
},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "except hdr", got: "DV HDR", want: []string{"DV HDR"}}}},
},
want: false,
},
{
name: "match_hdr_14",
fields: &Release{
TorrentName: "Good show shift S02 2160p ATVP WEB-DL DDP 5.1 Atmos DV HDR HEVC-GROUP",
Category: "TV",
Uploader: "Uploader1",
},
args: args{
filter: Filter{
Enabled: true,
MatchHDR: []string{"DV"},
},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "match hdr", got: "DV HDR", want: []string{"DV"}}}},
},
want: false,
},
{
name: "match_hdr_15",
fields: &Release{
TorrentName: "Good show shift S02 2160p ATVP WEB-DL DDP 5.1 Atmos DV HEVC-GROUP",
Category: "TV",
Uploader: "Uploader1",
},
args: args{
filter: Filter{
Enabled: true,
MatchHDR: []string{"DV HDR"},
},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "match hdr", got: "DV", want: []string{"DV HDR"}}}},
},
want: false,
},
@ -1498,7 +1562,7 @@ func TestFilter_CheckFilter1(t *testing.T) {
MatchHDR: []string{"HDR"},
},
args: args{&Release{TorrentName: "WeCrashed.S01.DV.2160p.ATVP.WEB-DL.DDPA5.1.x265-NOSiViD"}},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "match hdr", got: []string{"DV"}, want: []string{"HDR"}}}},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "match hdr", got: "DV", want: []string{"HDR"}}}},
wantMatch: false,
},
{
@ -1513,7 +1577,7 @@ func TestFilter_CheckFilter1(t *testing.T) {
ExceptHDR: []string{"DV", "HDR"},
},
args: args{&Release{TorrentName: "WeCrashed.S01.DV.2160p.ATVP.WEB-DL.DDPA5.1.x265-NOSiViD"}},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "except hdr", got: []string{"DV"}, want: []string{"DV", "HDR"}}}},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "except hdr", got: "DV", want: []string{"DV", "HDR"}}}},
wantMatch: false,
},
{
@ -1528,7 +1592,7 @@ func TestFilter_CheckFilter1(t *testing.T) {
ExceptHDR: []string{"DV", "HDR"},
},
args: args{&Release{TorrentName: "WeCrashed.S01.DV.2160p.ATVP.WEB-DL.DDPA5.1.x265-NOSiViD"}},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "shows", got: "WeCrashed", want: "WeWork"}, {key: "except hdr", got: []string{"DV"}, want: []string{"DV", "HDR"}}}},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "shows", got: "WeCrashed", want: "WeWork"}, {key: "except hdr", got: "DV", want: []string{"DV", "HDR"}}}},
wantMatch: false,
},
{
@ -1543,7 +1607,7 @@ func TestFilter_CheckFilter1(t *testing.T) {
ExceptHDR: []string{"DV", "HDR"},
},
args: args{&Release{TorrentName: "WeCrashed.S01.DV.2160p.ATVP.WEB-DL.DDPA5.1.x265-NOSiViD"}},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "shows", got: "WeCrashed", want: "WeWork"}, {key: "except release groups", got: "NOSiViD", want: "NOSiViD"}, {key: "except hdr", got: []string{"DV"}, want: []string{"DV", "HDR"}}}},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "shows", got: "WeCrashed", want: "WeWork"}, {key: "except release groups", got: "NOSiViD", want: "NOSiViD"}, {key: "except hdr", got: "DV", want: []string{"DV", "HDR"}}}},
wantMatch: false,
},
{
@ -1558,7 +1622,7 @@ func TestFilter_CheckFilter1(t *testing.T) {
ExceptHDR: []string{"DV", "HDR"},
},
args: args{&Release{TorrentName: "WeCrashed.S01.DV.2160p.ATVP.WEB.DDPA5.1.x265-NOSiViD"}},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "shows", got: "WeCrashed", want: "WeWork"}, {key: "except release groups", got: "NOSiViD", want: "NOSiViD"}, {key: "source", got: "WEB", want: []string{"WEB-DL"}}, {key: "except hdr", got: []string{"DV"}, want: []string{"DV", "HDR"}}}},
rejectionReasons: &RejectionReasons{data: []Rejection{{key: "shows", got: "WeCrashed", want: "WeWork"}, {key: "except release groups", got: "NOSiViD", want: "NOSiViD"}, {key: "source", got: "WEB", want: []string{"WEB-DL"}}, {key: "except hdr", got: "DV", want: []string{"DV", "HDR"}}}},
wantMatch: false,
},
{