diff --git a/cmd/debugtree/debugtree.go b/cmd/debugtree/debugtree.go index d5971a385..87ffc89fd 100644 --- a/cmd/debugtree/debugtree.go +++ b/cmd/debugtree/debugtree.go @@ -29,13 +29,13 @@ import ( var ( file = flag.String("f", "", "path to debug file") - fromRoot = flag.Bool("r", true, "build from root of the tree") - makeJson = flag.Bool("j", true, "generate json file") - makeTree = flag.Bool("t", true, "generate graphviz file") - printState = flag.Bool("s", true, "print result state debug") + fromRoot = flag.Bool("r", false, "build from root of the tree") + makeJson = flag.Bool("j", false, "generate json file") + makeTree = flag.Bool("t", false, "generate graphviz file") + printState = flag.Bool("s", false, "print result state debug") changeIdx = flag.Int("c", -1, "build tree before given index and print change") - objectStore = flag.Bool("o", true, "show object store info") - fileHashes = flag.Bool("h", true, "show file hashes in state") + objectStore = flag.Bool("o", false, "show object store info") + fileHashes = flag.Bool("h", false, "show file hashes in state") ) func main() { diff --git a/core/debug/exporter/exporter.go b/core/debug/exporter/exporter.go index 81e6c6716..f0d99d9d8 100644 --- a/core/debug/exporter/exporter.go +++ b/core/debug/exporter/exporter.go @@ -61,23 +61,23 @@ func ExportTree(ctx context.Context, params ExportParams) error { return err } var ( - changeBuilder = objecttree.NewChangeBuilder(crypto.NewKeyStorage(), params.Readable.Header()) + changeBuilder = objecttree.NewChangeBuilder(crypto.NewKeyStorage(), writeTree.Header()) converter = params.Converter changes []*treechangeproto.RawTreeChangeWithId ) - err = params.Readable.IterateRoot( + err = writeTree.IterateRoot( func(change *objecttree.Change, decrypted []byte) (any, error) { return converter.Unmarshall(change.DataType, decrypted) }, func(change *objecttree.Change) bool { - if change.Id == params.Readable.Id() { + if change.Id == writeTree.Id() { return true } var ( data []byte dataType string ) - data, dataType, err := converter.Marshall(change.Model) + data, dataType, err = converter.Marshall(change.Model) if err != nil { return false } @@ -97,7 +97,7 @@ func ExportTree(ctx context.Context, params ExportParams) error { return err } payload := objecttree.RawChangesPayload{ - NewHeads: params.Readable.Heads(), + NewHeads: writeTree.Heads(), RawChanges: changes, } res, err := writeTree.AddRawChanges(ctx, payload) diff --git a/core/debug/treeexporter.go b/core/debug/treeexporter.go index 33f3306a2..a44e81712 100644 --- a/core/debug/treeexporter.go +++ b/core/debug/treeexporter.go @@ -83,7 +83,7 @@ func (e *treeExporter) Export(ctx context.Context, path string, tree objecttree. } else { if len(data) > 0 { // TODO: [storage] fix details, take from main - // data[0].Details = transform(data[0].Details, e.anonymized, anonymize.Struct) + data[0].Details = transform(data[0].Details, e.anonymized, anonymize.Details) data[0].Snippet = transform(data[0].Snippet, e.anonymized, anonymize.Text) for i, r := range data[0].Relations { data[0].Relations[i] = transform(r, e.anonymized, anonymize.Relation)