mirror of
https://github.com/restic/restic.git
synced 2026-11-21 21:12:42 +00:00
restic rewrite include - based on restic 0.18.1
cmd/restic/cmd_rewrite.go: introduction of include filters for this command: - add include filters, add error checking code - add new parameter 'keepEmptyDirectoryFunc' to 'walker.NewSnapshotSizeRewriter()', so empty directories have to be kept to keep the directory structure intact - add parameter 'keepEmptySnapshot' to 'filterAndReplaceSnapshot()' to keep snapshots intact when nothing is to be included - introduce helper function 'gatherIncludeFilters()' and 'gatherExcludeFilters()' to keep code flow clean cmd/restic/cmd_rewrite_integration_test.go: add several new tests around the 'include' functionality internal/filter/include.go: this is where is include filter is defined internal/walker/rewriter.go: - struct RewriteOpts gains field 'KeepEmtpyDirectory', which is a 'NodeKeepEmptyDirectoryFunc()' which defaults to nil, so that al subdirectories are kept - function 'NewSnapshotSizeRewriter()' gains the parameter 'keepEmptyDirecoryFilter' which controls the management of empty subdirectories in case of include filters active internal/data/tree.go: gains a function Count() for checking the number if node elements in a newly built tree internal/walker/rewriter_test.go: function 'NewSnapshotSizeRewriter()' gets an additional parameter nil to keeps things happy cmd/restic/cmd_repair_snapshots.go: function 'filterAndReplaceSnapshot()' gets an additional parameter 'keepEmptySnapshot=nil' doc/045_working_with_repos.rst: gets to mention include filters changelog/unreleased/issue-4278: the usual announcement file git rebase master -i produced this restic rewrite include - keep linter happy cmd/restic/cmd_rewrite_integration_test.go: linter likes strings.Contain() better than my strings.Index() >= 0
This commit is contained in:
1 parent
083cdf0675
commit
5148608c39
9 files changed
+343
-30
No files matched your search
@@ -238,8 +238,9 @@ func SaveTree(ctx context.Context, saver restic.BlobSaver, nodes TreeNodeIterato
|
||||
}
|
||||
|
||||
type TreeJSONBuilder struct {
|
||||
buf bytes.Buffer
|
||||
lastName string
|
||||
buf bytes.Buffer
|
||||
lastName string
|
||||
countNodes int
|
||||
}
|
||||
|
||||
func NewTreeJSONBuilder() *TreeJSONBuilder {
|
||||
@@ -262,6 +263,7 @@ func (builder *TreeJSONBuilder) AddNode(node *Node) error {
|
||||
return err
|
||||
}
|
||||
_, _ = builder.buf.Write(val)
|
||||
builder.countNodes++
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -275,6 +277,11 @@ func (builder *TreeJSONBuilder) Finalize() ([]byte, error) {
|
||||
return buf, nil
|
||||
}
|
||||
|
||||
// Count returns the number of nodes in the tree
|
||||
func (builder *TreeJSONBuilder) Count() int {
|
||||
return builder.countNodes
|
||||
}
|
||||
|
||||
func FindTreeDirectory(ctx context.Context, repo restic.BlobLoader, id *restic.ID, dir string) (*restic.ID, error) {
|
||||
if id == nil {
|
||||
return nil, errors.New("tree id is null")
|
||||
|
||||
Reference in new issue
Block a user