mirror of
https://github.com/idanoo/autobrr
synced 2025-07-23 00:39:13 +00:00
refactor(filters): move rejections from release to filter (#1272)
* refactor: size check * refactor(filters): checkfilter rejections from release to filter --------- Co-authored-by: ze0s <ze0s@riseup.net>
This commit is contained in:
Frederick Robinson
GitHub
parent
df5fb37c9c
commit
365055fbe1
5 changed files with 186 additions and 161 deletions
|
|
@ -5,13 +5,13 @@ package domain
|
|||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/autobrr/autobrr/pkg/errors"
|
||||
"github.com/autobrr/autobrr/pkg/wildcard"
|
||||
|
||||
"github.com/dustin/go-humanize"
|
||||
|
|
@ -26,7 +26,7 @@ type FilterRepo interface {
|
|||
ListFilters(ctx context.Context) ([]Filter, error)
|
||||
Find(ctx context.Context, params FilterQueryParams) ([]Filter, error)
|
||||
FindByID(ctx context.Context, filterID int) (*Filter, error)
|
||||
FindByIndexerIdentifier(ctx context.Context, indexer string) ([]Filter, error)
|
||||
FindByIndexerIdentifier(ctx context.Context, indexer string) ([]*Filter, error)
|
||||
FindExternalFiltersByID(ctx context.Context, filterId int) ([]FilterExternal, error)
|
||||
Store(ctx context.Context, filter *Filter) error
|
||||
Update(ctx context.Context, filter *Filter) error
|
||||
|
|
@ -137,6 +137,7 @@ type Filter struct {
|
|||
External []FilterExternal `json:"external,omitempty"`
|
||||
Indexers []Indexer `json:"indexers"`
|
||||
Downloads *FilterDownloads `json:"-"`
|
||||
Rejections []string `json:"-"`
|
||||
}
|
||||
|
||||
type FilterExternal struct {
|
||||
|
|
@ -245,7 +246,7 @@ type FilterUpdate struct {
|
|||
Indexers []Indexer `json:"indexers,omitempty"`
|
||||
}
|
||||
|
||||
func (f Filter) Validate() error {
|
||||
func (f *Filter) Validate() error {
|
||||
if f.Name == "" {
|
||||
return errors.New("validation: name can't be empty")
|
||||
}
|
||||
|
|
@ -257,14 +258,11 @@ func (f Filter) Validate() error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (f Filter) CheckFilter(r *Release) ([]string, bool) {
|
||||
// reset rejections first to clean previous checks
|
||||
r.resetRejections()
|
||||
|
||||
func (f *Filter) CheckFilter(r *Release) ([]string, bool) {
|
||||
// max downloads check. If reached return early
|
||||
if f.MaxDownloads > 0 && !f.checkMaxDownloads(f.MaxDownloads, f.MaxDownloadsUnit) {
|
||||
r.addRejectionF("max downloads (%d) this (%v) reached", f.MaxDownloads, f.MaxDownloadsUnit)
|
||||
return r.Rejections, false
|
||||
f.addRejectionF("max downloads (%d) this (%v) reached", f.MaxDownloads, f.MaxDownloadsUnit)
|
||||
return f.Rejections, false
|
||||
}
|
||||
|
||||
if len(f.Bonus) > 0 && !sliceContainsSlice(r.Bonus, f.Bonus) {
|
||||
|
|
@ -272,136 +270,136 @@ func (f Filter) CheckFilter(r *Release) ([]string, bool) {
|
|||
}
|
||||
|
||||
if f.Freeleech && r.Freeleech != f.Freeleech {
|
||||
r.addRejection("wanted: freeleech")
|
||||
f.addRejection("wanted: freeleech")
|
||||
}
|
||||
|
||||
if f.FreeleechPercent != "" && !checkFreeleechPercent(r.FreeleechPercent, f.FreeleechPercent) {
|
||||
r.addRejectionF("freeleech percent not matching. got: %v want: %v", r.FreeleechPercent, f.FreeleechPercent)
|
||||
f.addRejectionF("freeleech percent not matching. got: %v want: %v", r.FreeleechPercent, f.FreeleechPercent)
|
||||
}
|
||||
|
||||
if len(f.Origins) > 0 && !containsSlice(r.Origin, f.Origins) {
|
||||
r.addRejectionF("origin not matching. got: %v want: %v", r.Origin, f.Origins)
|
||||
f.addRejectionF("origin not matching. got: %v want: %v", r.Origin, f.Origins)
|
||||
}
|
||||
if len(f.ExceptOrigins) > 0 && containsSlice(r.Origin, f.ExceptOrigins) {
|
||||
r.addRejectionF("except origin not matching. got: %v unwanted: %v", r.Origin, f.ExceptOrigins)
|
||||
f.addRejectionF("except origin not matching. got: %v unwanted: %v", r.Origin, f.ExceptOrigins)
|
||||
}
|
||||
|
||||
// title is the parsed title
|
||||
if f.Shows != "" && !contains(r.Title, f.Shows) {
|
||||
r.addRejectionF("shows not matching. got: %v want: %v", r.Title, f.Shows)
|
||||
f.addRejectionF("shows not matching. got: %v want: %v", r.Title, f.Shows)
|
||||
}
|
||||
|
||||
if f.Seasons != "" && !containsIntStrings(r.Season, f.Seasons) {
|
||||
r.addRejectionF("season not matching. got: %d want: %v", r.Season, f.Seasons)
|
||||
f.addRejectionF("season not matching. got: %d want: %v", r.Season, f.Seasons)
|
||||
}
|
||||
|
||||
if f.Episodes != "" && !containsIntStrings(r.Episode, f.Episodes) {
|
||||
r.addRejectionF("episodes not matching. got: %d want: %v", r.Episode, f.Episodes)
|
||||
f.addRejectionF("episodes not matching. got: %d want: %v", r.Episode, f.Episodes)
|
||||
}
|
||||
|
||||
// matchRelease
|
||||
// match against regex
|
||||
if f.UseRegex {
|
||||
if f.MatchReleases != "" && !matchRegex(r.TorrentName, f.MatchReleases) {
|
||||
r.addRejectionF("match release regex not matching. got: %v want: %v", r.TorrentName, f.MatchReleases)
|
||||
f.addRejectionF("match release regex not matching. got: %v want: %v", r.TorrentName, f.MatchReleases)
|
||||
}
|
||||
|
||||
if f.ExceptReleases != "" && matchRegex(r.TorrentName, f.ExceptReleases) {
|
||||
r.addRejectionF("except releases regex: unwanted release. got: %v want: %v", r.TorrentName, f.ExceptReleases)
|
||||
f.addRejectionF("except releases regex: unwanted release. got: %v want: %v", r.TorrentName, f.ExceptReleases)
|
||||
}
|
||||
|
||||
} else {
|
||||
if f.MatchReleases != "" && !containsFuzzy(r.TorrentName, f.MatchReleases) {
|
||||
r.addRejectionF("match release not matching. got: %v want: %v", r.TorrentName, f.MatchReleases)
|
||||
f.addRejectionF("match release not matching. got: %v want: %v", r.TorrentName, f.MatchReleases)
|
||||
}
|
||||
|
||||
if f.ExceptReleases != "" && containsFuzzy(r.TorrentName, f.ExceptReleases) {
|
||||
r.addRejectionF("except releases: unwanted release. got: %v want: %v", r.TorrentName, f.ExceptReleases)
|
||||
f.addRejectionF("except releases: unwanted release. got: %v want: %v", r.TorrentName, f.ExceptReleases)
|
||||
}
|
||||
}
|
||||
|
||||
if f.MatchReleaseGroups != "" && !contains(r.Group, f.MatchReleaseGroups) {
|
||||
r.addRejectionF("release groups not matching. got: %v want: %v", r.Group, f.MatchReleaseGroups)
|
||||
f.addRejectionF("release groups not matching. got: %v want: %v", r.Group, f.MatchReleaseGroups)
|
||||
}
|
||||
|
||||
if f.ExceptReleaseGroups != "" && contains(r.Group, f.ExceptReleaseGroups) {
|
||||
r.addRejectionF("unwanted release group. got: %v unwanted: %v", r.Group, f.ExceptReleaseGroups)
|
||||
f.addRejectionF("unwanted release group. got: %v unwanted: %v", r.Group, f.ExceptReleaseGroups)
|
||||
}
|
||||
|
||||
// check raw releaseTags string
|
||||
if f.UseRegexReleaseTags {
|
||||
if f.MatchReleaseTags != "" && !matchRegex(r.ReleaseTags, f.MatchReleaseTags) {
|
||||
r.addRejectionF("match release tags regex not matching. got: %v want: %v", r.ReleaseTags, f.MatchReleaseTags)
|
||||
f.addRejectionF("match release tags regex not matching. got: %v want: %v", r.ReleaseTags, f.MatchReleaseTags)
|
||||
}
|
||||
|
||||
if f.ExceptReleaseTags != "" && matchRegex(r.ReleaseTags, f.ExceptReleaseTags) {
|
||||
r.addRejectionF("except release tags regex: unwanted release. got: %v want: %v", r.ReleaseTags, f.ExceptReleaseTags)
|
||||
f.addRejectionF("except release tags regex: unwanted release. got: %v want: %v", r.ReleaseTags, f.ExceptReleaseTags)
|
||||
}
|
||||
|
||||
} else {
|
||||
if f.MatchReleaseTags != "" && !containsFuzzy(r.ReleaseTags, f.MatchReleaseTags) {
|
||||
r.addRejectionF("match release tags not matching. got: %v want: %v", r.ReleaseTags, f.MatchReleaseTags)
|
||||
f.addRejectionF("match release tags not matching. got: %v want: %v", r.ReleaseTags, f.MatchReleaseTags)
|
||||
}
|
||||
|
||||
if f.ExceptReleaseTags != "" && containsFuzzy(r.ReleaseTags, f.ExceptReleaseTags) {
|
||||
r.addRejectionF("except release tags: unwanted release. got: %v want: %v", r.ReleaseTags, f.ExceptReleaseTags)
|
||||
f.addRejectionF("except release tags: unwanted release. got: %v want: %v", r.ReleaseTags, f.ExceptReleaseTags)
|
||||
}
|
||||
}
|
||||
|
||||
if f.MatchUploaders != "" && !contains(r.Uploader, f.MatchUploaders) {
|
||||
r.addRejectionF("uploaders not matching. got: %v want: %v", r.Uploader, f.MatchUploaders)
|
||||
f.addRejectionF("uploaders not matching. got: %v want: %v", r.Uploader, f.MatchUploaders)
|
||||
}
|
||||
|
||||
if f.ExceptUploaders != "" && contains(r.Uploader, f.ExceptUploaders) {
|
||||
r.addRejectionF("unwanted uploaders. got: %v unwanted: %v", r.Uploader, f.ExceptUploaders)
|
||||
f.addRejectionF("unwanted uploaders. got: %v unwanted: %v", r.Uploader, f.ExceptUploaders)
|
||||
}
|
||||
|
||||
if len(f.MatchLanguage) > 0 && !sliceContainsSlice(r.Language, f.MatchLanguage) {
|
||||
r.addRejectionF("language not matching. got: %v want: %v", r.Language, f.MatchLanguage)
|
||||
f.addRejectionF("language not matching. got: %v want: %v", r.Language, f.MatchLanguage)
|
||||
}
|
||||
|
||||
if len(f.ExceptLanguage) > 0 && sliceContainsSlice(r.Language, f.ExceptLanguage) {
|
||||
r.addRejectionF("language unwanted. got: %v want: %v", r.Language, f.ExceptLanguage)
|
||||
f.addRejectionF("language unwanted. got: %v want: %v", r.Language, f.ExceptLanguage)
|
||||
}
|
||||
|
||||
if len(f.Resolutions) > 0 && !containsSlice(r.Resolution, f.Resolutions) {
|
||||
r.addRejectionF("resolution not matching. got: %v want: %v", r.Resolution, f.Resolutions)
|
||||
f.addRejectionF("resolution not matching. got: %v want: %v", r.Resolution, f.Resolutions)
|
||||
}
|
||||
|
||||
if len(f.Codecs) > 0 && !sliceContainsSlice(r.Codec, f.Codecs) {
|
||||
r.addRejectionF("codec not matching. got: %v want: %v", r.Codec, f.Codecs)
|
||||
f.addRejectionF("codec not matching. got: %v want: %v", r.Codec, f.Codecs)
|
||||
}
|
||||
|
||||
if len(f.Sources) > 0 && !containsSlice(r.Source, f.Sources) {
|
||||
r.addRejectionF("source not matching. got: %v want: %v", r.Source, f.Sources)
|
||||
f.addRejectionF("source not matching. got: %v want: %v", r.Source, f.Sources)
|
||||
}
|
||||
|
||||
if len(f.Containers) > 0 && !containsSlice(r.Container, f.Containers) {
|
||||
r.addRejectionF("container not matching. got: %v want: %v", r.Container, f.Containers)
|
||||
f.addRejectionF("container not matching. got: %v want: %v", r.Container, f.Containers)
|
||||
}
|
||||
|
||||
// HDR is parsed into the Codec slice from rls
|
||||
if len(f.MatchHDR) > 0 && !matchHDR(r.HDR, f.MatchHDR) {
|
||||
r.addRejectionF("hdr not matching. got: %v want: %v", r.HDR, f.MatchHDR)
|
||||
f.addRejectionF("hdr not matching. got: %v want: %v", r.HDR, f.MatchHDR)
|
||||
}
|
||||
|
||||
// HDR is parsed into the Codec slice from rls
|
||||
if len(f.ExceptHDR) > 0 && matchHDR(r.HDR, f.ExceptHDR) {
|
||||
r.addRejectionF("hdr unwanted. got: %v want: %v", r.HDR, f.ExceptHDR)
|
||||
f.addRejectionF("hdr unwanted. got: %v want: %v", r.HDR, f.ExceptHDR)
|
||||
}
|
||||
|
||||
// Other is parsed into the Other slice from rls
|
||||
if len(f.MatchOther) > 0 && !sliceContainsSlice(r.Other, f.MatchOther) {
|
||||
r.addRejectionF("match other not matching. got: %v want: %v", r.Other, f.MatchOther)
|
||||
f.addRejectionF("match other not matching. got: %v want: %v", r.Other, f.MatchOther)
|
||||
}
|
||||
|
||||
// Other is parsed into the Other slice from rls
|
||||
if len(f.ExceptOther) > 0 && sliceContainsSlice(r.Other, f.ExceptOther) {
|
||||
r.addRejectionF("except other unwanted. got: %v unwanted: %v", r.Other, f.ExceptOther)
|
||||
f.addRejectionF("except other unwanted. got: %v unwanted: %v", r.Other, f.ExceptOther)
|
||||
}
|
||||
|
||||
if f.Years != "" && !containsIntStrings(r.Year, f.Years) {
|
||||
r.addRejectionF("year not matching. got: %d want: %v", r.Year, f.Years)
|
||||
f.addRejectionF("year not matching. got: %d want: %v", r.Year, f.Years)
|
||||
}
|
||||
|
||||
if f.MatchCategories != "" {
|
||||
|
|
@ -411,7 +409,7 @@ func (f Filter) CheckFilter(r *Release) ([]string, bool) {
|
|||
categories = append(categories, r.Category)
|
||||
}
|
||||
if !contains(r.Category, f.MatchCategories) && !containsAny(categories, f.MatchCategories) {
|
||||
r.addRejectionF("category not matching. got: %v want: %v", strings.Join(categories, ","), f.MatchCategories)
|
||||
f.addRejectionF("category not matching. got: %v want: %v", strings.Join(categories, ","), f.MatchCategories)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -422,99 +420,99 @@ func (f Filter) CheckFilter(r *Release) ([]string, bool) {
|
|||
categories = append(categories, r.Category)
|
||||
}
|
||||
if contains(r.Category, f.ExceptCategories) && containsAny(categories, f.ExceptCategories) {
|
||||
r.addRejectionF("category unwanted. got: %v unwanted: %v", strings.Join(categories, ","), f.ExceptCategories)
|
||||
f.addRejectionF("category unwanted. got: %v unwanted: %v", strings.Join(categories, ","), f.ExceptCategories)
|
||||
}
|
||||
}
|
||||
|
||||
if len(f.MatchReleaseTypes) > 0 && !containsSlice(r.Category, f.MatchReleaseTypes) {
|
||||
r.addRejectionF("release type not matching. got: %v want: %v", r.Category, f.MatchReleaseTypes)
|
||||
f.addRejectionF("release type not matching. got: %v want: %v", r.Category, f.MatchReleaseTypes)
|
||||
}
|
||||
|
||||
if (f.MinSize != "" || f.MaxSize != "") && !f.checkSizeFilter(r, f.MinSize, f.MaxSize) {
|
||||
r.addRejectionF("size not matching. got: %v want min: %v max: %v", r.Size, f.MinSize, f.MaxSize)
|
||||
if (f.MinSize != "" || f.MaxSize != "") && !f.checkSizeFilter(r) {
|
||||
f.addRejectionF("size not matching. got: %v want min: %v max: %v", r.Size, f.MinSize, f.MaxSize)
|
||||
}
|
||||
|
||||
if f.Tags != "" {
|
||||
if f.TagsMatchLogic == "ALL" && !containsAll(r.Tags, f.Tags) {
|
||||
r.addRejectionF("tags not matching. got: %v want(all): %v", r.Tags, f.Tags)
|
||||
f.addRejectionF("tags not matching. got: %v want(all): %v", r.Tags, f.Tags)
|
||||
} else if !containsAny(r.Tags, f.Tags) { // TagsMatchLogic is set to "" by default, this makes sure that "" and "ANY" are treated the same way.
|
||||
r.addRejectionF("tags not matching. got: %v want: %v", r.Tags, f.Tags)
|
||||
f.addRejectionF("tags not matching. got: %v want: %v", r.Tags, f.Tags)
|
||||
}
|
||||
}
|
||||
|
||||
if f.ExceptTags != "" {
|
||||
if f.ExceptTagsMatchLogic == "ALL" && containsAll(r.Tags, f.ExceptTags) {
|
||||
r.addRejectionF("tags unwanted. got: %v don't want: %v", r.Tags, f.ExceptTags)
|
||||
f.addRejectionF("tags unwanted. got: %v don't want: %v", r.Tags, f.ExceptTags)
|
||||
} else if containsAny(r.Tags, f.ExceptTags) { // ExceptTagsMatchLogic is set to "" by default, this makes sure that "" and "ANY" are treated the same way.
|
||||
r.addRejectionF("tags unwanted. got: %v don't want: %v", r.Tags, f.ExceptTags)
|
||||
f.addRejectionF("tags unwanted. got: %v don't want: %v", r.Tags, f.ExceptTags)
|
||||
}
|
||||
}
|
||||
|
||||
if len(f.Artists) > 0 && !contains(r.Artists, f.Artists) {
|
||||
r.addRejectionF("artists not matching. got: %v want: %v", r.Artists, f.Artists)
|
||||
f.addRejectionF("artists not matching. got: %v want: %v", r.Artists, f.Artists)
|
||||
}
|
||||
|
||||
if len(f.Albums) > 0 && !contains(r.Title, f.Albums) {
|
||||
r.addRejectionF("albums not matching. got: %v want: %v", r.Title, f.Albums)
|
||||
f.addRejectionF("albums not matching. got: %v want: %v", r.Title, f.Albums)
|
||||
}
|
||||
|
||||
// Perfect flac requires Cue, Log, Log Score 100, FLAC and 24bit Lossless
|
||||
if f.PerfectFlac && !f.isPerfectFLAC(r) {
|
||||
r.addRejectionF("wanted: perfect flac. got: %v", r.Audio)
|
||||
f.addRejectionF("wanted: perfect flac. got: %v", r.Audio)
|
||||
}
|
||||
|
||||
if len(f.Formats) > 0 && !sliceContainsSlice(r.Audio, f.Formats) {
|
||||
r.addRejectionF("formats not matching. got: %v want: %v", r.Audio, f.Formats)
|
||||
f.addRejectionF("formats not matching. got: %v want: %v", r.Audio, f.Formats)
|
||||
}
|
||||
|
||||
if len(f.Quality) > 0 && !sliceContainsSlice(r.Audio, f.Quality) {
|
||||
r.addRejectionF("quality not matching. got: %v want: %v", r.Audio, f.Quality)
|
||||
f.addRejectionF("quality not matching. got: %v want: %v", r.Audio, f.Quality)
|
||||
}
|
||||
|
||||
if len(f.Media) > 0 && !containsSlice(r.Source, f.Media) {
|
||||
r.addRejectionF("media not matching. got: %v want: %v", r.Source, f.Media)
|
||||
f.addRejectionF("media not matching. got: %v want: %v", r.Source, f.Media)
|
||||
}
|
||||
|
||||
if f.Cue && !containsAny(r.Audio, "Cue") {
|
||||
r.addRejection("wanted: cue")
|
||||
f.addRejection("wanted: cue")
|
||||
}
|
||||
|
||||
if f.Log && !containsAny(r.Audio, "Log") {
|
||||
r.addRejection("wanted: log")
|
||||
f.addRejection("wanted: log")
|
||||
}
|
||||
|
||||
if f.Log && f.LogScore != 0 && r.LogScore != f.LogScore {
|
||||
r.addRejectionF("log score. got: %v want: %v", r.LogScore, f.LogScore)
|
||||
f.addRejectionF("log score. got: %v want: %v", r.LogScore, f.LogScore)
|
||||
}
|
||||
|
||||
// check description string
|
||||
if f.UseRegexDescription {
|
||||
if f.MatchDescription != "" && !matchRegex(r.Description, f.MatchDescription) {
|
||||
r.addRejectionF("match description regex not matching. got: %v want: %v", r.Description, f.MatchDescription)
|
||||
f.addRejectionF("match description regex not matching. got: %v want: %v", r.Description, f.MatchDescription)
|
||||
}
|
||||
|
||||
if f.ExceptDescription != "" && matchRegex(r.Description, f.ExceptDescription) {
|
||||
r.addRejectionF("except description regex: unwanted release. got: %v want: %v", r.Description, f.ExceptDescription)
|
||||
f.addRejectionF("except description regex: unwanted release. got: %v want: %v", r.Description, f.ExceptDescription)
|
||||
}
|
||||
|
||||
} else {
|
||||
if f.MatchDescription != "" && !containsFuzzy(r.Description, f.MatchDescription) {
|
||||
r.addRejectionF("match description not matching. got: %v want: %v", r.Description, f.MatchDescription)
|
||||
f.addRejectionF("match description not matching. got: %v want: %v", r.Description, f.MatchDescription)
|
||||
}
|
||||
|
||||
if f.ExceptDescription != "" && containsFuzzy(r.Description, f.ExceptDescription) {
|
||||
r.addRejectionF("except description: unwanted release. got: %v want: %v", r.Description, f.ExceptDescription)
|
||||
f.addRejectionF("except description: unwanted release. got: %v want: %v", r.Description, f.ExceptDescription)
|
||||
}
|
||||
}
|
||||
|
||||
if len(r.Rejections) > 0 {
|
||||
return r.Rejections, false
|
||||
if len(f.Rejections) > 0 {
|
||||
return f.Rejections, false
|
||||
}
|
||||
|
||||
return nil, true
|
||||
}
|
||||
|
||||
func (f Filter) checkMaxDownloads(max int, perTimeUnit FilterMaxDownloadsUnit) bool {
|
||||
func (f *Filter) checkMaxDownloads(max int, perTimeUnit FilterMaxDownloadsUnit) bool {
|
||||
if f.Downloads == nil {
|
||||
return false
|
||||
}
|
||||
|
|
@ -548,7 +546,7 @@ func (f Filter) checkMaxDownloads(max int, perTimeUnit FilterMaxDownloadsUnit) b
|
|||
}
|
||||
|
||||
// isPerfectFLAC Perfect is "CD FLAC Cue Log 100% Lossless or 24bit Lossless"
|
||||
func (f Filter) isPerfectFLAC(r *Release) bool {
|
||||
func (f *Filter) isPerfectFLAC(r *Release) bool {
|
||||
if !contains(r.Source, "CD") {
|
||||
return false
|
||||
}
|
||||
|
|
@ -573,7 +571,7 @@ func (f Filter) isPerfectFLAC(r *Release) bool {
|
|||
|
||||
// checkSizeFilter compares the filter size limits to a release's size if it is
|
||||
// known from the announce line.
|
||||
func (f Filter) checkSizeFilter(r *Release, minSize string, maxSize string) bool {
|
||||
func (f *Filter) checkSizeFilter(r *Release) bool {
|
||||
if r.Size == 0 {
|
||||
r.AdditionalSizeCheckRequired = true
|
||||
return true
|
||||
|
|
@ -581,19 +579,48 @@ func (f Filter) checkSizeFilter(r *Release, minSize string, maxSize string) bool
|
|||
r.AdditionalSizeCheckRequired = false
|
||||
}
|
||||
|
||||
sizeErr, err := f.CheckReleaseSize(r.Size)
|
||||
sizeOK, err := f.CheckReleaseSize(r.Size)
|
||||
if err != nil {
|
||||
r.addRejectionF("size: error checking release size against filter: %+v", err)
|
||||
f.addRejectionF("size: error checking release size against filter: %+v", err)
|
||||
return false
|
||||
}
|
||||
if sizeErr != nil {
|
||||
r.addRejectionF("%+v", sizeErr)
|
||||
|
||||
if !sizeOK {
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
func (f *Filter) addRejection(reason string) {
|
||||
f.Rejections = append(f.Rejections, reason)
|
||||
}
|
||||
|
||||
func (f *Filter) AddRejectionF(format string, v ...interface{}) {
|
||||
f.addRejectionF(format, v...)
|
||||
}
|
||||
|
||||
func (f *Filter) addRejectionF(format string, v ...interface{}) {
|
||||
f.Rejections = append(f.Rejections, fmt.Sprintf(format, v...))
|
||||
}
|
||||
|
||||
// ResetRejections reset rejections
|
||||
func (f *Filter) resetRejections() {
|
||||
f.Rejections = []string{}
|
||||
}
|
||||
|
||||
func (f *Filter) RejectionsString(trim bool) string {
|
||||
if len(f.Rejections) > 0 {
|
||||
out := strings.Join(f.Rejections, ", ")
|
||||
if trim && len(out) > 1024 {
|
||||
out = out[:1024]
|
||||
}
|
||||
|
||||
return out
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func matchRegex(tag string, filterList string) bool {
|
||||
if tag == "" {
|
||||
return false
|
||||
|
|
@ -923,21 +950,23 @@ func matchHDR(releaseValues []string, filterValues []string) bool {
|
|||
return false
|
||||
}
|
||||
|
||||
func (f Filter) CheckReleaseSize(releaseSize uint64) (sizeErr, err error) {
|
||||
min, max, err := f.parsedSizeLimits()
|
||||
func (f *Filter) CheckReleaseSize(releaseSize uint64) (bool, error) {
|
||||
minBytes, maxBytes, err := f.parsedSizeLimits()
|
||||
if err != nil {
|
||||
return err, err
|
||||
return false, err
|
||||
}
|
||||
|
||||
if min != nil && releaseSize <= *min {
|
||||
return fmt.Errorf("release size %d bytes <= min size %d bytes", releaseSize, *min), nil
|
||||
if minBytes != nil && releaseSize <= *minBytes {
|
||||
f.addRejectionF("release size %d bytes smaller than filter min size %d bytes", releaseSize, *minBytes)
|
||||
return false, nil
|
||||
}
|
||||
|
||||
if max != nil && releaseSize >= *max {
|
||||
return fmt.Errorf("release size %d bytes <= max size %d bytes", releaseSize, *max), nil
|
||||
if maxBytes != nil && releaseSize >= *maxBytes {
|
||||
f.addRejectionF("release size %d bytes is larger than filter max size %d bytes", releaseSize, *maxBytes)
|
||||
return false, nil
|
||||
}
|
||||
|
||||
return nil, nil
|
||||
return true, nil
|
||||
}
|
||||
|
||||
// parsedSizeLimits parses filter bytes limits (expressed as a string) into a
|
||||
|
|
@ -945,18 +974,18 @@ func (f Filter) CheckReleaseSize(releaseSize uint64) (sizeErr, err error) {
|
|||
// with "nil" representing "no limit". We break out filter size limit parsing
|
||||
// into a discrete step so that we can more easily check parsability at filter
|
||||
// creation time.
|
||||
func (f Filter) parsedSizeLimits() (*uint64, *uint64, error) {
|
||||
min, err := parseBytes(f.MinSize)
|
||||
func (f *Filter) parsedSizeLimits() (*uint64, *uint64, error) {
|
||||
minBytes, err := parseBytes(f.MinSize)
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("trouble parsing min size: %w", err)
|
||||
return nil, nil, errors.Wrap(err, "could not parse filter min size")
|
||||
}
|
||||
|
||||
max, err := parseBytes(f.MaxSize)
|
||||
maxBytes, err := parseBytes(f.MaxSize)
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("trouble parsing max size: %w", err)
|
||||
return nil, nil, errors.Wrap(err, "could not parse filter max size")
|
||||
}
|
||||
|
||||
return min, max, nil
|
||||
return minBytes, maxBytes, nil
|
||||
}
|
||||
|
||||
// parseBytes parses a string representation of a file size into a number of
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue