octoleo
/
restic
mirror of https://github.com/octoleo/restic.git
2
2
Fork 0
Code Issues Releases Wiki Activity

rewrite: use treejsonbuilder

This commit is contained in:
Michael Eischer 2022-09-06 22:19:20 +02:00
parent 82592b88b5
commit 4d6ab83019
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cmd/restic/cmd_rewrite.go
View File

@ -76,7 +76,7 @@ func init() {
f.StringArrayVar(&rewriteOptions.ExcludeFiles, "exclude-file", nil, "read exclude patterns from a `file` (can be specified multiple times)") f.StringArrayVar(&rewriteOptions.ExcludeFiles, "exclude-file", nil, "read exclude patterns from a `file` (can be specified multiple times)")
} }
type saveTreeFunction = func(*restic.Tree) (restic.ID, error) type saveTreeFunction func([]byte) (restic.ID, error)
func filterNode(ctx context.Context, repo restic.Repository, nodepath string, nodeID restic.ID, checkExclude RejectByNameFunc, saveTreeFunc saveTreeFunction) (newNodeID restic.ID, err error) { func filterNode(ctx context.Context, repo restic.Repository, nodepath string, nodeID restic.ID, checkExclude RejectByNameFunc, saveTreeFunc saveTreeFunction) (newNodeID restic.ID, err error) {
curTree, err := restic.LoadTree(ctx, repo, nodeID) curTree, err := restic.LoadTree(ctx, repo, nodeID)
@ -87,26 +87,25 @@ func filterNode(ctx context.Context, repo restic.Repository, nodepath string, no
debug.Log("filterNode: %s, nodeId: %s\n", nodepath, nodeID.Str()) debug.Log("filterNode: %s, nodeId: %s\n", nodepath, nodeID.Str())
changed := false changed := false
newTree := restic.NewTree(len(curTree.Nodes)) tb := restic.NewTreeJSONBuilder()
for _, node := range curTree.Nodes { for _, node := range curTree.Nodes {
path := path.Join(nodepath, node.Name) path := path.Join(nodepath, node.Name)
if !checkExclude(path) { if !checkExclude(path) {
if node.Subtree == nil { if node.Subtree == nil {
newTree.Insert(node) tb.AddNode(node)
continue continue
} }
newNode := node
newID, err := filterNode(ctx, repo, path, *node.Subtree, checkExclude, saveTreeFunc) newID, err := filterNode(ctx, repo, path, *node.Subtree, checkExclude, saveTreeFunc)
if err != nil { if err != nil {
return nodeID, err return restic.ID{}, err
} }
if newID == *node.Subtree { if !node.Subtree.Equal(newID) {
newTree.Insert(node)
} else {
changed = true changed = true
newNode.Subtree = new(restic.ID) }
*newNode.Subtree = newID node.Subtree = &newID
newTree.Insert(newNode) err = tb.AddNode(node)
if err != nil {
return restic.ID{}, err
} }
} else { } else {
Verbosef("excluding %s\n", path) Verbosef("excluding %s\n", path)
@ -115,8 +114,13 @@ func filterNode(ctx context.Context, repo restic.Repository, nodepath string, no
} }
if changed { if changed {
tree, err := tb.Finalize()
if err != nil {
return restic.ID{}, err
}
// Save new tree // Save new tree
newTreeID, err := saveTreeFunc(newTree) newTreeID, err := saveTreeFunc(tree)
debug.Log("filterNode: save new tree for %s as %v\n", nodepath, newTreeID) debug.Log("filterNode: save new tree for %s as %v\n", nodepath, newTreeID)
return newTreeID, err return newTreeID, err
} }
@ -154,12 +158,13 @@ func rewriteSnapshot(ctx context.Context, repo *repository.Repository, sn *resti
var saveTreeFunc saveTreeFunction var saveTreeFunc saveTreeFunction
if !opts.DryRun { if !opts.DryRun {
saveTreeFunc = func(tree *restic.Tree) (restic.ID, error) { saveTreeFunc = func(tree []byte) (restic.ID, error) {
return restic.SaveTree(ctx, repo, tree) id, _, _, err := repo.SaveBlob(ctx, restic.TreeBlob, tree, restic.ID{}, false)
return id, err
} }
} else { } else {
saveTreeFunc = func(tree *restic.Tree) (restic.ID, error) { saveTreeFunc = func(tree []byte) (restic.ID, error) {
return restic.ID{0}, nil return restic.ID{}, nil
} }
} }