From 5a6af6dd2c181020103dc389979637445706d872 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Wed, 25 Jan 2023 10:13:01 +0100 Subject: [PATCH] Change interfaces for import tree --- .../tree/exporter/{treeviewer.go => treeimport.go} | 9 ++++++++- commonspace/object/tree/objecttree/treefactory.go | 8 ++++---- 2 files changed, 12 insertions(+), 5 deletions(-) rename commonspace/object/tree/exporter/{treeviewer.go => treeimport.go} (50%) diff --git a/commonspace/object/tree/exporter/treeviewer.go b/commonspace/object/tree/exporter/treeimport.go similarity index 50% rename from commonspace/object/tree/exporter/treeviewer.go rename to commonspace/object/tree/exporter/treeimport.go index 510e458f..69384b6a 100644 --- a/commonspace/object/tree/exporter/treeviewer.go +++ b/commonspace/object/tree/exporter/treeimport.go @@ -6,6 +6,13 @@ import ( "github.com/anytypeio/any-sync/commonspace/object/tree/treestorage" ) -func ViewObjectTree(listStorage liststorage.ListStorage, treeStorage treestorage.TreeStorage) (objecttree.ReadableObjectTree, error) { +type TreeImportParams struct { + ListStorage liststorage.ListStorage + TreeStorage treestorage.TreeStorage + BeforeId string + IncludeBeforeId bool +} + +func ImportHistoryTree(params TreeImportParams) (objecttree.ReadableObjectTree, error) { return nil, nil } diff --git a/commonspace/object/tree/objecttree/treefactory.go b/commonspace/object/tree/objecttree/treefactory.go index 2dd0d9e0..8eb5b466 100644 --- a/commonspace/object/tree/objecttree/treefactory.go +++ b/commonspace/object/tree/objecttree/treefactory.go @@ -91,13 +91,13 @@ func BuildObjectTree(treeStorage treestorage.TreeStorage, aclList list.AclList) return buildObjectTree(deps) } -func BuildNonVerifiableTree(treeStorage treestorage.TreeStorage, aclList list.AclList) (ObjectTree, error) { - rootChange, err := treeStorage.Root() +func BuildNonVerifiableHistoryTree(params HistoryTreeParams) (HistoryTree, error) { + rootChange, err := params.TreeStorage.Root() if err != nil { return nil, err } - deps := nonVerifiableTreeDeps(rootChange, treeStorage, aclList) - return buildObjectTree(deps) + deps := nonVerifiableTreeDeps(rootChange, params.TreeStorage, params.AclList) + return buildHistoryTree(deps, params) } func BuildHistoryTree(params HistoryTreeParams) (HistoryTree, error) {