Cleanup exclude pattern collection

restic · Nov 12, 2022 · bb0fa76 · bb0fa76
1 parent 537cfe2
commit bb0fa76
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cmd/restic/cmd_backup.go b/cmd/restic/cmd_backup.go
@@ -306,7 +306,7 @@ func collectRejectByNameFuncs(opts BackupOptions, repo *repository.Repository, t
 		fs = append(fs, f)
 	}
 
-	fsPatterns, err := collectExcludePatterns(opts.excludePatternOptions)
+	fsPatterns, err := opts.excludePatternOptions.CollectPatterns()
 	if err != nil {
 		return nil, err
 	}

diff --git a/cmd/restic/cmd_rewrite.go b/cmd/restic/cmd_rewrite.go
@@ -73,7 +73,7 @@ func rewriteSnapshot(ctx context.Context, repo *repository.Repository, sn *resti
 		return false, errors.Errorf("snapshot %v has nil tree", sn.ID().Str())
 	}
 
-	rejectByNameFuncs, err := collectExcludePatterns(opts.excludePatternOptions)
+	rejectByNameFuncs, err := opts.excludePatternOptions.CollectPatterns()
 	if err != nil {
 		return false, err
 	}

diff --git a/cmd/restic/exclude.go b/cmd/restic/exclude.go
@@ -479,7 +479,7 @@ func (opts *excludePatternOptions) Empty() bool {
 	return len(opts.Excludes) == 0 && len(opts.InsensitiveExcludes) == 0 && len(opts.ExcludeFiles) == 0 && len(opts.InsensitiveExcludeFiles) == 0
 }
 
-func collectExcludePatterns(opts excludePatternOptions) ([]RejectByNameFunc, error) {
+func (opts excludePatternOptions) CollectPatterns() ([]RejectByNameFunc, error) {
 	var fs []RejectByNameFunc
 	// add patterns from file
 	if len(opts.ExcludeFiles) > 0 {