octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-06-05 18:40:49 +00:00
Code Issues Releases Wiki Activity

Keep original pattern for later use

Browse Source
This commit is contained in:
Lorenz Bausch 2022-05-07 20:51:52 +02:00
parent fb5b9370f3
commit e7fd200237
No known key found for this signature in database
GPG Key ID: FF6F200261C01807
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/filter/filter.go
View File

@ -18,6 +18,7 @@ type patternPart struct {
// Pattern represents a preparsed filter pattern // Pattern represents a preparsed filter pattern
type Pattern struct { type Pattern struct {
original string
parts []patternPart parts []patternPart
isNegated bool isNegated bool
} }
@ -31,6 +32,9 @@ func prepareStr(str string) ([]string, error) {
func preparePattern(patternStr string) Pattern { func preparePattern(patternStr string) Pattern {
var negate bool var negate bool
originalPattern := patternStr
if patternStr[0] == '!' { if patternStr[0] == '!' {
negate = true negate = true
patternStr = patternStr[1:] patternStr = patternStr[1:]
@ -48,7 +52,7 @@ func preparePattern(patternStr string) Pattern {
parts[i] = patternPart{part, isSimple} parts[i] = patternPart{part, isSimple}
} }
return Pattern{parts, negate} return Pattern{originalPattern, parts, negate}
} }
// Split p into path components. Assuming p has been Cleaned, no component // Split p into path components. Assuming p has been Cleaned, no component
@ -130,7 +134,7 @@ func childMatch(pattern Pattern, strs []string) (matched bool, err error) {
} else { } else {
l = len(strs) l = len(strs)
} }
return match(Pattern{pattern.parts[0:l], pattern.isNegated}, strs) return match(Pattern{pattern.original, pattern.parts[0:l], pattern.isNegated}, strs)
} }
func hasDoubleWildcard(list Pattern) (ok bool, pos int) { func hasDoubleWildcard(list Pattern) (ok bool, pos int) {
@ -158,7 +162,7 @@ func match(pattern Pattern, strs []string) (matched bool, err error) {
} }
newPat = append(newPat, pattern.parts[pos+1:]...) newPat = append(newPat, pattern.parts[pos+1:]...)
matched, err := match(Pattern{newPat, pattern.isNegated}, strs) matched, err := match(Pattern{pattern.original, newPat, pattern.isNegated}, strs)
if err != nil { if err != nil {
return false, err return false, err
} }