anyproto/anytype-heart
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-heart.git synced 2025-06-09 09:35:00 +09:00
Code Activity

GO-983: Use type provider instead of SmartBlockTypeFromID

Browse source
This commit is contained in:
Sergey 2023-04-25 18:17:59 +02:00 • committed by Mikhail Iudin
parent 3d645fe040
commit 768eedaf45
No known key found for this signature in database
GPG key ID: FAAAA8BAABDFF1C0
34 changed files with 1177 additions and 1223 deletions
Download patch file Download diff file Expand all files Collapse all files

33
util/builtinobjects/builtinobjects.go
View file

@ -4,7 +4,6 @@ import (
"archive/zip"
"bytes"
"context"
_ "embed"
"fmt"
"io"
"io/ioutil"
@ -12,15 +11,13 @@ import (
"strings"
"time"
"github.com/textileio/go-threads/core/thread"
sb "github.com/anytypeio/go-anytype-middleware/core/block/editor/smartblock"
"github.com/anytypeio/any-sync/app"
"github.com/gogo/protobuf/types"
"github.com/textileio/go-threads/core/thread"
"github.com/anytypeio/go-anytype-middleware/core/anytype/config"
"github.com/anytypeio/go-anytype-middleware/core/block"
sb "github.com/anytypeio/go-anytype-middleware/core/block/editor/smartblock"
"github.com/anytypeio/go-anytype-middleware/core/block/editor/state"
"github.com/anytypeio/go-anytype-middleware/core/block/simple"
"github.com/anytypeio/go-anytype-middleware/core/block/simple/bookmark"
@ -37,7 +34,10 @@ import (
"github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/logging"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model"
"github.com/anytypeio/go-anytype-middleware/space/typeprovider"
"github.com/anytypeio/go-anytype-middleware/util/pbtypes"
_ "embed"
)
const CName = "builtinobjects"
@ -54,24 +54,27 @@ const (
injectionTimeout = 30 * time.Second
)
func New() BuiltinObjects {
return new(builtinObjects)
}
type BuiltinObjects interface {
app.ComponentRunnable
}
type builtinObjects struct {
cancel func()
source source.Service
service *block.Service
relService relation2.Service
cancel func()
source source.Service
service *block.Service
relService relation2.Service
sbtProvider typeprovider.SmartBlockTypeProvider
createBuiltinObjects bool
idsMap map[string]string
}
func New(sbtProvider typeprovider.SmartBlockTypeProvider) BuiltinObjects {
return &builtinObjects{
sbtProvider: sbtProvider,
}
}
func (b *builtinObjects) Init(a *app.App) (err error) {
b.source = a.MustComponent(source.CName).(source.Service)
b.service = a.MustComponent(block.CName).(*block.Service)
@ -117,7 +120,7 @@ func (b *builtinObjects) inject(ctx context.Context) (err error) {
isSpaceDashboardIDFound := false
for _, zf := range zr.File {
id := strings.TrimSuffix(zf.Name, filepath.Ext(zf.Name))
sbt, err := smartblock.SmartBlockTypeFromID(id)
sbt, err := b.sbtProvider.Type(id)
if err != nil {
sbt, err = SmartBlockTypeFromThreadID(id)
if err != nil {
@ -192,7 +195,7 @@ func (b *builtinObjects) createObject(ctx context.Context, rd io.ReadCloser) (er
st.SetRootId(newId)
a := st.Get(newId)
m := a.Model()
sbt, err := smartblock.SmartBlockTypeFromID(newId)
sbt, err := b.sbtProvider.Type(newId)
if sbt == smartblock.SmartBlockTypeSubObject {
ot, err := bundle.TypeKeyFromUrl(pbtypes.GetString(st.CombinedDetails(), bundle.RelationKeyType.String()))
if err != nil {

10
util/builtintemplate/builtintemplate.go
View file

@ -5,7 +5,6 @@ import (
"bytes"
"context"
"crypto/md5"
_ "embed"
"encoding/binary"
"encoding/hex"
"fmt"
@ -13,6 +12,7 @@ import (
"io/ioutil"
"github.com/anytypeio/any-sync/app"
"github.com/anytypeio/go-anytype-middleware/core/block/editor/state"
"github.com/anytypeio/go-anytype-middleware/core/block/simple"
"github.com/anytypeio/go-anytype-middleware/core/block/simple/relation"
@ -23,6 +23,8 @@ import (
"github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr"
"github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model"
"github.com/anytypeio/go-anytype-middleware/util/pbtypes"
_ "embed"
)
const CName = "builtintemplate"
@ -119,10 +121,8 @@ func (b *builtinTemplate) registerBuiltin(rd io.ReadCloser) (err error) {
if err = b.validate(st.Copy()); err != nil {
return
}
log.With("id", id).Info("registering template")
b.source.RegisterStaticSource(id, func() source.Source {
return b.source.NewStaticSource(id, model.SmartBlockType_BundledTemplate, st.Copy(), nil)
})
b.source.RegisterStaticSource(id, b.source.NewStaticSource(id, model.SmartBlockType_BundledTemplate, st.Copy(), nil))
return
}