vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-04-20 19:38:39 +00:00
Code Issues Projects Releases Wiki Activity

Introduce regexp query matching.

Browse Source
This commit is contained in:
Andrey Smirnov
2014-07-15 19:00:06 +04:00
parent a632469890
commit 56d777af0a
8 changed files with 66 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
deb/query.go
View File

@@ -2,6 +2,7 @@ package deb
import (
"path/filepath"
"regexp"
)
// PackageQuery is interface of predicate on Package
@@ -34,6 +35,7 @@ type FieldQuery struct {
Field string
Relation int
Value string
Regexp *regexp.Regexp
}
// PkgQuery is search request against specific package
@@ -114,7 +116,7 @@ func (q *NotQuery) Query(list *PackageList) (result *PackageList) {
// Matches on generic field
func (q *FieldQuery) Matches(pkg *Package) bool {
if q.Field == "$Version" {
return pkg.MatchesDependency(Dependency{Pkg: pkg.Name, Relation: q.Relation, Version: q.Value})
return pkg.MatchesDependency(Dependency{Pkg: pkg.Name, Relation: q.Relation, Version: q.Value, Regexp: q.Regexp})
}
if q.Field == "$Architecture" && q.Relation == VersionEqual {
return pkg.MatchesArchitecture(q.Value)
@@ -139,7 +141,7 @@ func (q *FieldQuery) Matches(pkg *Package) bool {
matched, err := filepath.Match(q.Value, field)
return err == nil && matched
case VersionRegexp:
panic("regexp matching not implemented yet")
return q.Regexp.FindStringIndex(field) != nil
}
panic("unknown relation")