1
0

Implement as normal filter

This commit is contained in:
2023-05-11 22:17:31 +00:00
parent 2e6ce1e8f9
commit ad0a3706cb
2 changed files with 21 additions and 22 deletions

View File

@ -283,7 +283,18 @@ func contains(pkgs []Package, pkg Package) bool {
return false
}
func Packages(srcname, version, arch, regex string) (pkgs []Package, err error) {
func filtered(s string, filter []string) bool {
for _, f := range filter {
if strings.Contains(s, f) {
return true
}
}
return false
}
func Packages(srcname, version, arch, regex string,
filter []string) (pkgs []Package, err error) {
binpkgs, err := mr.GetBinpackages(srcname, version)
if err == mr.ErrNotFound {
err = nil
@ -296,7 +307,7 @@ func Packages(srcname, version, arch, regex string) (pkgs []Package, err error)
r := regexp.MustCompile(regex)
for _, res := range binpkgs.Result {
if !r.MatchString(res.Name) {
if !r.MatchString(res.Name) || filtered(res.Name, filter) {
continue
}