lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

export Pattern and NewPattern

Browse Source
This commit is contained in:
risk danger olson 2016-11-21 16:44:41 -07:00
parent bf173a7a21
commit 5f017796f5
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
filepathfilter/filepathfilter.go
View File

@ -7,20 +7,21 @@ import (
"strings" "strings"
) )
type pattern interface { type Pattern interface {
Match(filename string) bool Match(filename string) bool
} }
type Filter struct { type Filter struct {
include []pattern include []Pattern
exclude []pattern exclude []Pattern
}
func NewFromPatterns(include, exclude []Pattern) *Filter {
return &Filter{include: include, exclude: exclude}
} }
func New(include, exclude []string) *Filter { func New(include, exclude []string) *Filter {
return &Filter{ return NewFromPatterns(convertToPatterns(include), convertToPatterns(exclude))
include: convertToPatterns(include),
exclude: convertToPatterns(exclude),
}
} }
func (f *Filter) Allows(filename string) bool { func (f *Filter) Allows(filename string) bool {
@ -58,7 +59,7 @@ func (f *Filter) Allows(filename string) bool {
return true return true
} }
func newPattern(rawpattern string) pattern { func NewPattern(rawpattern string) Pattern {
cleanpattern := filepath.Clean(rawpattern) cleanpattern := filepath.Clean(rawpattern)
// Special case local dir, matches all (inc subpaths) // Special case local dir, matches all (inc subpaths)
@ -94,10 +95,10 @@ func newPattern(rawpattern string) pattern {
} }
} }
func convertToPatterns(rawpatterns []string) []pattern { func convertToPatterns(rawpatterns []string) []Pattern {
patterns := make([]pattern, len(rawpatterns)) patterns := make([]Pattern, len(rawpatterns))
for i, raw := range rawpatterns { for i, raw := range rawpatterns {
patterns[i] = newPattern(raw) patterns[i] = NewPattern(raw)
} }
return patterns return patterns
} }

2
filepathfilter/filepathfilter_test.go
View File

@ -46,7 +46,7 @@ func TestPatternMatch(t *testing.T) {
} }
func patternMatch(pattern, filename string) bool { func patternMatch(pattern, filename string) bool {
return newPattern(pattern).Match(filepath.Clean(filename)) return NewPattern(pattern).Match(filepath.Clean(filename))
} }
type filterTest struct { type filterTest struct {