benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make settings iterate from root, hide settings from user

Browse Source
This commit is contained in:
mcrakhman 2023-01-14 22:24:57 +01:00 committed by Mikhail Iudin
parent 7a57d7b0c4
commit d7cae8e32e
No known key found for this signature in database
GPG Key ID: FAAAA8BAABDFF1C0
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
commonspace/settings/idprovider.go
View File

@ -51,9 +51,8 @@ func (p *provider) ProvideIds(tr objecttree.ObjectTree, startId string) (ids []s
} }
if startId == "" { if startId == "" {
err = tr.IterateFrom(tr.Id(), convert, process) startId = rootId
} else {
err = tr.IterateFrom(startId, convert, process)
} }
err = tr.IterateFrom(startId, convert, process)
return return
} }

3
commonspace/settings/idprovider_test.go
View File

@ -78,8 +78,7 @@ func TestProvider_ProvideIds(t *testing.T) {
t.Run("startId is empty", func(t *testing.T) { t.Run("startId is empty", func(t *testing.T) {
ch := &objecttree.Change{Id: "rootId"} ch := &objecttree.Change{Id: "rootId"}
objTree.EXPECT().Root().Return(ch) objTree.EXPECT().Root().Return(ch)
objTree.EXPECT().Id().Return("id") objTree.EXPECT().IterateFrom("rootId", gomock.Any(), gomock.Any()).Return(nil)
objTree.EXPECT().IterateFrom("id", gomock.Any(), gomock.Any()).Return(nil)
_, _, err := prov.ProvideIds(objTree, "") _, _, err := prov.ProvideIds(objTree, "")
require.NoError(t, err) require.NoError(t, err)
}) })

5
commonspace/space.go
View File

@ -24,6 +24,7 @@ import (
"github.com/anytypeio/any-sync/nodeconf" "github.com/anytypeio/any-sync/nodeconf"
"github.com/anytypeio/any-sync/util/keys/asymmetric/encryptionkey" "github.com/anytypeio/any-sync/util/keys/asymmetric/encryptionkey"
"github.com/anytypeio/any-sync/util/keys/asymmetric/signingkey" "github.com/anytypeio/any-sync/util/keys/asymmetric/signingkey"
"github.com/anytypeio/any-sync/util/slice"
"github.com/zeebo/errs" "github.com/zeebo/errs"
"go.uber.org/zap" "go.uber.org/zap"
"strconv" "strconv"
@ -228,7 +229,9 @@ func (s *space) Storage() spacestorage.SpaceStorage {
} }
func (s *space) StoredIds() []string { func (s *space) StoredIds() []string {
return s.headSync.AllIds() return slice.DiscardFromSlice(s.headSync.AllIds(), func(id string) bool {
return id == s.settingsObject.Id()
})
} }
func (s *space) DebugAllHeads() []headsync.TreeHeads { func (s *space) DebugAllHeads() []headsync.TreeHeads {