KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

restore: accumulate results of multiple pattern checks

Browse source 
addressing review comments
This commit is contained in:
Srigovind Nayak 2024-06-01 20:37:52 +05:30
parent e579dfe72a
commit 3a52176121
No known key found for this signature in database
GPG key ID: 3C4A72A34ABD4C43
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cmd/restic/cmd_restore.go
View file

@ -150,9 +150,10 @@ func runRestore(ctx context.Context, opts RestoreOptions, gopts GlobalOptions,
} }
selectExcludeFilter := func(item string, _ string, node *restic.Node) (selectedForRestore bool, childMayBeSelected bool) { selectExcludeFilter := func(item string, _ string, node *restic.Node) (selectedForRestore bool, childMayBeSelected bool) {
matched := false
for _, rejectFn := range excludePatternFns { for _, rejectFn := range excludePatternFns {
matched := rejectFn(item) matched = matched || rejectFn(item)
}
// An exclude filter is basically a 'wildcard but foo', // An exclude filter is basically a 'wildcard but foo',
// so even if a childMayMatch, other children of a dir may not, // so even if a childMayMatch, other children of a dir may not,
// therefore childMayMatch does not matter, but we should not go down // therefore childMayMatch does not matter, but we should not go down
@ -162,12 +163,14 @@ func runRestore(ctx context.Context, opts RestoreOptions, gopts GlobalOptions,
return selectedForRestore, childMayBeSelected return selectedForRestore, childMayBeSelected
} }
return selectedForRestore, childMayBeSelected
}
selectIncludeFilter := func(item string, _ string, node *restic.Node) (selectedForRestore bool, childMayBeSelected bool) { selectIncludeFilter := func(item string, _ string, node *restic.Node) (selectedForRestore bool, childMayBeSelected bool) {
selectedForRestore = false
childMayBeSelected = false
for _, includeFn := range includePatternFns { for _, includeFn := range includePatternFns {
selectedForRestore, childMayBeSelected = includeFn(item) matched, childMayMatch := includeFn(item)
selectedForRestore = selectedForRestore || matched
childMayBeSelected = childMayBeSelected || childMayMatch
} }
childMayBeSelected = childMayBeSelected && node.Type == "dir" childMayBeSelected = childMayBeSelected && node.Type == "dir"